From a7d6eb75c20d185c45a0bff309c68e1efaae990e Mon Sep 17 00:00:00 2001 From: Tannin Date: Sun, 9 Aug 2015 15:16:57 +0200 Subject: reverted most changes of changeset 626da419828a as I don't agree with them --- src/mainwindow.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index abf91d8f..5ecebb1e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -983,7 +983,7 @@ void MainWindow::startExeAction() selectedExecutable.m_Arguments, selectedExecutable.m_WorkingDirectory.length() != 0 ? selectedExecutable.m_WorkingDirectory : selectedExecutable.m_BinaryInfo.absolutePath(), - selectedExecutable.closeOnExecution(), + selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE, selectedExecutable.m_SteamAppID); } else { qCritical("not an action?"); @@ -1643,7 +1643,7 @@ void MainWindow::on_startButton_clicked() selectedExecutable.m_Arguments, selectedExecutable.m_WorkingDirectory.length() != 0 ? selectedExecutable.m_WorkingDirectory : selectedExecutable.m_BinaryInfo.absolutePath(), - selectedExecutable.closeOnExecution(), + selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE, selectedExecutable.m_SteamAppID); } @@ -1755,7 +1755,7 @@ void MainWindow::on_executablesListBox_currentIndexChanged(int index) if (executablesList->isEnabled()) { //I think the 2nd test is impossible - if ((index == 0) || (index > static_cast(m_OrganizerCore.executablesList()->size()))) { + if ((index == 0) || (index >= static_cast(m_OrganizerCore.executablesList()->size()))) { if (modifyExecutablesDialog()) { setExecutableIndex(previousIndex); } @@ -3560,8 +3560,9 @@ void MainWindow::addAsExecutable() binaryInfo.absoluteFilePath(), arguments, targetInfo.absolutePath(), + ExecutableInfo::CloseMOStyle::DEFAULT_STAY, QString(), - Executable::SettableFlags()); + Executable::CustomExecutable); refreshExecutablesList(); } } break; -- cgit v1.3.1