From e690b96eb878544ce0ebf6004e0b2de298bbe1bf Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Wed, 13 Apr 2016 11:49:59 +0200 Subject: [PATCH] Fix compilation error on Windows (variable defined only for OSX/Linux used in wrong places) --- src/core/UBApplication.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index d6baf9ab..494feff8 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -369,11 +369,12 @@ void UBApplication::showMinimized() { #ifdef Q_OS_OSX mainWindow->hide(); + bIsMinimized = true; #elif defined(Q_OS_LINUX) mainWindow->showMinimized(); + bIsMinimized = true; #endif - bIsMinimized = true; } @@ -584,16 +585,18 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) { boardController->controlView()->setMultiselection(false); - if (bIsMinimized) { #if defined(Q_OS_OSX) + if (bIsMinimized) { if (mainWindow->isHidden()) mainWindow->show(); bIsMinimized = false; + } #elif defined(Q_OS_LINUX) + if (bIsMinimized) { bIsMinimized = false; UBPlatformUtils::showFullScreen(mainWindow); -#endif } +#endif } return result;