chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

RestartApplication() Fix for Mac

Browse Source
This commit is contained in:
Mark Watkins 2011-12-18 14:30:08 +10:00
parent a5c0cfa49b
commit 1ca78c3698
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UpdaterWindow.cpp
View File

@ -189,9 +189,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev)
} }
if (!release || (VersionString() > release->version)) { if (!release || (VersionString() > release->version)) {
mainwin->Notify("No updates were found for your platform",5000,"SleepyHead Updates"); mainwin->Notify("No updates were found for your platform",5000,"SleepyHead Updates");
sh_delay(4000);
close(); close();
return;
} }

5
mainwindow.cpp
View File

@ -518,7 +518,6 @@ void MainWindow::CheckForUpdates()
void MainWindow::on_actionCheck_for_Updates_triggered() void MainWindow::on_actionCheck_for_Updates_triggered()
{ {
UpdaterWindow *w=new UpdaterWindow(this); UpdaterWindow *w=new UpdaterWindow(this);
w->checkForUpdates(); w->checkForUpdates();
// if (PREF.Exists("Updates_LastChecked")) { // if (PREF.Exists("Updates_LastChecked")) {
@ -1154,7 +1153,9 @@ void MainWindow::RestartApplication(bool force_login)
apppath=QApplication::instance()->applicationDirPath().section("/",0,-3); apppath=QApplication::instance()->applicationDirPath().section("/",0,-3);
QStringList args; QStringList args;
args << "-n" << apppath << "-p"; // -n option is important, as it opens a new process args << "-n"; // -n option is important, as it opens a new process
args << apppath << -p;
if (force_login) args << "-l"; if (force_login) args << "-l";
// -p starts with 1 second delay, to give this process time to save.. // -p starts with 1 second delay, to give this process time to save..