diff options
| author | Tom Tanner <thosrtanner2@users.sourceforge.net> | 2015-08-09 15:56:39 +0100 |
|---|---|---|
| committer | Tom Tanner <thosrtanner2@users.sourceforge.net> | 2015-08-09 15:56:39 +0100 |
| commit | b0d86c9e01659a5058184932e423308dad9c7c29 (patch) | |
| tree | 015eef2e9eec84895d12d493270b7280797f793f /src/mainwindow.cpp | |
| parent | e6abe486a73928b8ec5bf01acd475d23aec722e0 (diff) | |
| parent | b0982148609a8a6f0d73d801ec9fcd1a22930f98 (diff) | |
Merge
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5ecebb1e..abf91d8f 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.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE,
+ selectedExecutable.closeOnExecution(),
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.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE,
+ selectedExecutable.closeOnExecution(),
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<int>(m_OrganizerCore.executablesList()->size()))) {
+ if ((index == 0) || (index > static_cast<int>(m_OrganizerCore.executablesList()->size()))) {
if (modifyExecutablesDialog()) {
setExecutableIndex(previousIndex);
}
@@ -3560,9 +3560,8 @@ void MainWindow::addAsExecutable() binaryInfo.absoluteFilePath(),
arguments,
targetInfo.absolutePath(),
- ExecutableInfo::CloseMOStyle::DEFAULT_STAY,
QString(),
- Executable::CustomExecutable);
+ Executable::SettableFlags());
refreshExecutablesList();
}
} break;
|