SettingsProvider/main: Read single instance socket path from config
This commit is contained in:
vanhempi
3fbbc7d653
commit
6813e54e9b
6
main.cpp
6
main.cpp
@ -69,9 +69,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
SettingsProvider settingsProvider{settings};
|
||||
EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths());
|
||||
// TODO if setting single instance mode
|
||||
|
||||
QLocalSocket localSocket;
|
||||
localSocket.connectToServer("/tmp/qsrun.socket");
|
||||
localSocket.connectToServer(settingsProvider.socketPath());
|
||||
SingleInstanceServer server;
|
||||
if(localSocket.isOpen() && localSocket.isWritable())
|
||||
{
|
||||
@ -84,7 +84,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!server.listen("/tmp/qsrun.socket"))
|
||||
if(!server.listen(settingsProvider.socketPath()))
|
||||
{
|
||||
qDebug() << "Failed to listen on socket!";
|
||||
}
|
||||
|
@ -33,3 +33,8 @@ QString SettingsProvider::getTerminalCommand() const
|
||||
{
|
||||
return settings->value("terminal", "/usr/bin/x-terminal-emulator -e %c").toString();
|
||||
}
|
||||
|
||||
QString SettingsProvider::socketPath() const
|
||||
{
|
||||
return settings->value("singleInstanceSocket", "/tmp/qsrun").toString();
|
||||
}
|
||||
|
@ -16,6 +16,7 @@ class SettingsProvider
|
||||
virtual int getMaxCols() const;
|
||||
virtual bool singleInstanceMode() const;
|
||||
QString getTerminalCommand() const;
|
||||
QString socketPath() const;
|
||||
};
|
||||
|
||||
#endif // SETTINGSPROVIDER_H
|
||||
|
Ladataan…
Viittaa uudesa ongelmassa
Block a user