Merge pull request #252 from LePresidente/new_vfs_library

Update master to latest stable code.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/executableslist.cpp b/src/executableslist.cpp
index a4511ade..21cb6ed4 100644
--- a/src/executableslist.cpp
+++ b/src/executableslist.cpp
@@ -50,7 +50,6 @@ void ExecutablesList::init(IPluginGame const *game)
                             info.binary().absoluteFilePath(),

                             info.arguments().join(" "),

                             info.workingDirectory().absolutePath(),

-                            info.closeMO(),

                             info.steamAppID());

     }

   }

@@ -87,7 +86,7 @@ Executable &ExecutablesList::find(const QString &title)
       return exe;

     }

   }

-  throw std::runtime_error(QString("invalid name %1").arg(title).toLocal8Bit().constData());

+  throw std::runtime_error(QString("invalid executable name %1").arg(title).toLocal8Bit().constData());

 }

 

 

@@ -135,7 +134,6 @@ void ExecutablesList::updateExecutable(const QString &title,
                                        const QString &executableName,

                                        const QString &arguments,

                                        const QString &workingDirectory,

-                                       ExecutableInfo::CloseMOStyle closeMO,

                                        const QString &steamAppID,

                                        Executable::Flags mask,

                                        Executable::Flags flags)

@@ -146,7 +144,6 @@ void ExecutablesList::updateExecutable(const QString &title,
 

   if (existingExe != m_Executables.end()) {

     existingExe->m_Title = title;

-    existingExe->m_CloseMO = closeMO;

     existingExe->m_Flags &= ~mask;

     existingExe->m_Flags |= flags;

     // for pre-configured executables don't overwrite settings we didn't store

@@ -162,7 +159,6 @@ void ExecutablesList::updateExecutable(const QString &title,
   } else {

     Executable newExe;

     newExe.m_Title = title;

-    newExe.m_CloseMO = closeMO;

     newExe.m_BinaryInfo = file;

     newExe.m_Arguments = arguments;

     newExe.m_WorkingDirectory = workingDirectory;

@@ -186,18 +182,17 @@ void ExecutablesList::remove(const QString &title)
 

 void ExecutablesList::addExecutableInternal(const QString &title, const QString &executableName,

                                             const QString &arguments, const QString &workingDirectory,

-                                            ExecutableInfo::CloseMOStyle closeMO, const QString &steamAppID)

+                                            const QString &steamAppID)

 {

   QFileInfo file(executableName);

   if (file.exists()) {

     Executable newExe;

-    newExe.m_CloseMO = closeMO;

     newExe.m_BinaryInfo = file;

     newExe.m_Title = title;

     newExe.m_Arguments = arguments;

     newExe.m_WorkingDirectory = workingDirectory;

     newExe.m_SteamAppID = steamAppID;

-    newExe.m_Flags = 0;

+    newExe.m_Flags = Executable::UseApplicationIcon;

     m_Executables.push_back(newExe);

   }

 }