From 9c3b390f081aff3a9777d4bb002e5c5b3bc2473e Mon Sep 17 00:00:00 2001
From: Tom Tanner <thosrtanner2@users.sourceforge.net>
Date: Tue, 11 Aug 2015 21:53:00 +0100
Subject: Fix up merge mess

---
 src/mainwindow.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index abf91d8f..422207bb 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);
 }
 
@@ -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