Skip to content

Commit e9aecc6

Browse files
committed
Revert "Use the same approach to exit the app in all platforms"
This reverts commit d6fa28d.
1 parent b4c347b commit e9aecc6

File tree

1 file changed

+21
-6
lines changed

1 file changed

+21
-6
lines changed

Source/MEGASync/MegaApplication.cpp

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,8 +1062,12 @@ void MegaApplication::rebootApplication(bool update)
10621062
trayIcon->hide();
10631063
closeDialogs();
10641064

1065+
#ifdef __APPLE__
10651066
cleanAll();
10661067
::exit(0);
1068+
#endif
1069+
1070+
QApplication::exit();
10671071
}
10681072

10691073
void MegaApplication::exitApplication()
@@ -1076,9 +1080,12 @@ void MegaApplication::exitApplication()
10761080
trayIcon->hide();
10771081
closeDialogs();
10781082

1079-
cleanAll();
1080-
::exit(0);
1083+
#ifdef __APPLE__
1084+
cleanAll();
1085+
::exit(0);
1086+
#endif
10811087

1088+
QApplication::exit();
10821089
return;
10831090
#ifndef __APPLE__
10841091
}
@@ -1102,8 +1109,12 @@ void MegaApplication::exitApplication()
11021109
trayIcon->hide();
11031110
closeDialogs();
11041111

1105-
cleanAll();
1106-
::exit(0);
1112+
#ifdef __APPLE__
1113+
cleanAll();
1114+
::exit(0);
1115+
#endif
1116+
1117+
QApplication::exit();
11071118
}
11081119
}
11091120
else
@@ -1567,8 +1578,12 @@ void MegaApplication::setupWizardFinished()
15671578
{
15681579
if(!preferences->logged())
15691580
{
1570-
cleanAll();
1571-
::exit(0);
1581+
#ifdef __APPLE__
1582+
cleanAll();
1583+
::exit(0);
1584+
#endif
1585+
1586+
QApplication::exit();
15721587
return;
15731588
}
15741589

0 commit comments

Comments
 (0)