Skip to content

Commit

Permalink
Fix fallback to system tray based notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 8, 2018
1 parent 43d3870 commit 1eee885
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/app/qgisapp.cpp
Expand Up @@ -704,13 +704,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
} }
endProfile(); endProfile();


if ( !( QgsGui::nativePlatformInterface()->capabilities() & QgsNative::NativeDesktopNotifications ) )
{
mTray = new QSystemTrayIcon();
mTray->setIcon( QIcon( QgsApplication::appIconPath() ) );
mTray->hide();
}

// Create the themes folder for the user // Create the themes folder for the user
startProfile( QStringLiteral( "Creating theme folder" ) ); startProfile( QStringLiteral( "Creating theme folder" ) );
QgsApplication::createThemeFolder(); QgsApplication::createThemeFolder();
Expand Down Expand Up @@ -1322,6 +1315,13 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
QgsGui::instance()->nativePlatformInterface()->hideApplicationProgress(); QgsGui::instance()->nativePlatformInterface()->hideApplicationProgress();
} ); } );


if ( !( QgsGui::nativePlatformInterface()->capabilities() & QgsNative::NativeDesktopNotifications ) )
{
mTray = new QSystemTrayIcon();
mTray->setIcon( QIcon( QgsApplication::appIconPath() ) );
mTray->hide();
}

// supposedly all actions have been added, now register them to the shortcut manager // supposedly all actions have been added, now register them to the shortcut manager
QgsGui::shortcutsManager()->registerAllChildren( this ); QgsGui::shortcutsManager()->registerAllChildren( this );
QgsGui::shortcutsManager()->registerAllChildren( mSnappingWidget ); QgsGui::shortcutsManager()->registerAllChildren( mSnappingWidget );
Expand Down

0 comments on commit 1eee885

Please sign in to comment.