dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-06 06:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

try to fix crash on macOS

Browse Source
This commit is contained in:
Le Tan 2019-12-17 07:43:49 +08:00
parent b46afb551c
commit 1f154c08c5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -265,6 +265,7 @@ int main(int argc, char *argv[])
g_palette = &palette; g_palette = &palette;
VMainWindow w(&guard); VMainWindow w(&guard);
app.setWindow(&w);
QString style = palette.fetchQtStyleSheet(); QString style = palette.fetchQtStyleSheet();
if (!style.isEmpty()) { if (!style.isEmpty()) {
app.setStyleSheet(style); app.setStyleSheet(style);
@ -276,8 +277,8 @@ int main(int argc, char *argv[])
w.kickOffStartUpTimer(filePaths); w.kickOffStartUpTimer(filePaths);
app.setWindow(&w);
int ret = app.exec(); int ret = app.exec();
app.setWindow(nullptr);
if (ret == RESTART_EXIT_CODE) { if (ret == RESTART_EXIT_CODE) {
// Ask to restart VNote. // Ask to restart VNote.
guard.exit(); guard.exit();

5
src/vapplication.cpp
View File

@ -3,14 +3,15 @@
VApplication::VApplication(int &argc, char **argv) VApplication::VApplication(int &argc, char **argv)
: QApplication(argc, argv) : QApplication(argc, argv)
{ {
connect(this, &QApplication::applicationStateChanged, this, &VApplication::onApplicationStateChanged); connect(this, &QApplication::applicationStateChanged,
this, &VApplication::onApplicationStateChanged);
} }
void VApplication::onApplicationStateChanged(Qt::ApplicationState state) void VApplication::onApplicationStateChanged(Qt::ApplicationState state)
{ {
Q_UNUSED(state); Q_UNUSED(state);
#if defined(Q_OS_MACOS) || defined(Q_OS_MAC) #if defined(Q_OS_MACOS) || defined(Q_OS_MAC)
if(state == Qt::ApplicationActive) { if(state == Qt::ApplicationActive && this->window) {
this->window->show(); this->window->show();
// Need to call raise() in macOS. // Need to call raise() in macOS.
this->window->raise(); this->window->raise();

4
src/vapplication.h
View File

@ -21,7 +21,7 @@ public slots:
void onApplicationStateChanged(Qt::ApplicationState state); void onApplicationStateChanged(Qt::ApplicationState state);
private: private:
VMainWindow *window; VMainWindow *window = nullptr;
}; };
#endif // VAPPLICATION_H #endif // VAPPLICATION_H