Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-24 16:31:22 +01:00
Code Issues Releases Wiki Activity

Remove "-session" from the commandline to fix session management on KDE. Fixes issue #769

Browse Source
This commit is contained in:
David Sansome 2010-12-11 10:04:17 +00:00
parent 292fdd3e7f
commit 7650c1eddc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/commandlineoptions.cpp
View File

@ -75,18 +75,24 @@ CommandlineOptions::CommandlineOptions(int argc, char** argv)
{
#ifdef Q_OS_DARWIN
// Remove -psn_xxx option that Mac passes when opened from Finder.
RemoveArg("-psn", 1);
#endif
// Remove the -session option that KDE passes
RemoveArg("-session", 2);
}
void CommandlineOptions::RemoveArg(const QString& starts_with, int count) {
for (int i = 0; i < argc_; ++i) {
QString opt(argv_[i]);
if (opt.startsWith("-psn")) {
// Shuffle remaining args.
for (int j = i; j < argc_; ++j) {
argv_[j] = argv_[j+1];
if (opt.startsWith(starts_with)) {
for (int j = i; j < argc_ - count + 1; ++j) {
argv_[j] = argv_[j+count];
}
--argc_;
argc_ -= count;
break;
}
}
#endif
}
bool CommandlineOptions::Parse() {

1
src/core/commandlineoptions.h
View File

@ -79,6 +79,7 @@ class CommandlineOptions {
};
QString tr(const char* source_text);
void RemoveArg(const QString& starts_with, int count);
private:
int argc_;