rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed name for Mac and Linux Build #4696

This commit is contained in:
Adam Potolsky 2015-05-29 16:20:47 -07:00
parent 8d70075171
commit e35fd80cef
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/src/Plugin.cpp
View File

@ -73,9 +73,9 @@ QString Plugin::getOsSpecificName(const QString& pluginName)
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
result.append(getOsSpecificExt()); result.append(getOsSpecificExt());
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
result = kMacPluginPrefix + pluginName + getPluginOsSpecificExt(); result = kMacPluginPrefix + pluginName + getOsSpecificExt();
#else #else
result = kLinuxPluginPrefix + pluginName + getPluginOsSpecificExt(); result = kLinuxPluginPrefix + pluginName + getOsSpecificExt();
#endif #endif
return result; return result;
} }

2
src/gui/src/PluginManager.cpp
View File

@ -101,8 +101,10 @@ void PluginManager::copyPlugins()
QString newName = destDirName; QString newName = destDirName;
newName.append(QDir::separator()).append(m_FileSysPluginList.at(i)); newName.append(QDir::separator()).append(m_FileSysPluginList.at(i));
// Check to see if the plugin already exists
QFile newFile(newName); QFile newFile(newName);
if(newFile.exists()) { if(newFile.exists()) {
// If it does, delete it. TODO: Check to see if same and leave
newFile.remove(); newFile.remove();
} }
// make a copy of the plugin in the new location // make a copy of the plugin in the new location