mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-02 00:10:22 +02:00
Fix crashes after merge
This commit is contained in:
parent
9b96fa2351
commit
330b107a23
@ -992,7 +992,7 @@ void MainWindow::onSelectionMade(int level, bool anythingSelected)
|
||||
{
|
||||
if (level == mapLevel)
|
||||
{
|
||||
auto info = QString::asprintf("Selection on layer %s: %s", level, anythingSelected ? "true" : "false");
|
||||
auto info = QString::asprintf("Selection on layer %d: %b", level, anythingSelected ? "true" : "false");
|
||||
setStatusMessage(info);
|
||||
|
||||
ui->actionErase->setEnabled(anythingSelected);
|
||||
|
@ -32,8 +32,6 @@ WindowNewMap::WindowNewMap(QWidget *parent) :
|
||||
mapGenOptions.setHeight(ui->heightTxt->text().toInt());
|
||||
bool twoLevel = ui->twoLevelCheck->isChecked();
|
||||
mapGenOptions.setHasTwoLevels(twoLevel);
|
||||
mapGenOptions.setPlayerCount(ui->humanCombo->currentText().toInt());
|
||||
mapGenOptions.setCompOnlyPlayerCount(ui->cpuCombo->currentText().toInt());
|
||||
updateTemplateList();
|
||||
|
||||
loadLastTemplate();
|
||||
@ -132,10 +130,6 @@ void WindowNewMap::loadLastTemplate()
|
||||
ui->templateCombo->setCurrentIndex(index);
|
||||
on_templateCombo_activated(index);
|
||||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::critical(this, "", "Failed to load template name");
|
||||
}
|
||||
}
|
||||
|
||||
void WindowNewMap::saveUserSettings()
|
||||
|
Loading…
Reference in New Issue
Block a user