From 93f1426901ecc184354639da8f7838dd690ba671 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 7 Nov 2011 20:54:47 +1000 Subject: [PATCH] Use QDesktopServices to handle app relaunch --- preferencesdialog.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 599b32da..e23935f4 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "preferencesdialog.h" #include "ui_preferencesdialog.h" #include "SleepLib/machine_common.h" @@ -277,17 +278,27 @@ void PreferencesDialog::Save() if (QMessageBox::question(this,"Restart Required","One or more of the changes you have made will require this application to be restarted, in order for these changes to come into effect.\nWould you like do this now?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { QProcess proc; QStringList args; + QApplication::instance()->exit(); + QString apppath; #ifdef Q_OS_MAC // In Mac OS the full path of aplication binary is: // /myApp.app/Contents/MacOS/myApp - args << (QApplication::instance()->applicationDirPath() + "/../../../SleepyHead.app"); + apppath=QApplication::instance()->applicationDirPath()+"/../../../SleepyHead.app"; //qDebug() << "Would restart on mac if this was correct" << args; //qDebug() << "repeating applicationDirPath for clarity: " << QApplication::instance()->applicationDirPath(); - proc.start("open", args); #else - proc.startDetached(QApplication::instance()->applicationFilePath(),args); + apppath=QApplication::instance()->applicationFilePath(); + //if (QDesktopServices::openUrl(apppath)) { + //if (proc.startDetached(QApplication::instance()->applicationFilePath(),args)) { + // QApplication::instance()->exit(); + //} #endif - QApplication::instance()->exit(); + if (QDesktopServices::openUrl(apppath)) { + //if (proc.startDetached("open", args)) { + QApplication::instance()->exit(); + } else { + QMessageBox::warning(this,"Couldn't relaunch","Could not relaunch correctly on this platform, sorry, you will have to do this manually.",QMessageBox::Ok); + } } } }