Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -refb549a694539630ba7c1d8e348f598052b85f0f -r544436bd97cb7679865fa2c972a601a471065e2e
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision efb549a694539630ba7c1d8e348f598052b85f0f)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 544436bd97cb7679865fa2c972a601a471065e2e)
@@ -53,6 +53,12 @@
 
     // Alarms dialog/bar navigation handling ----- vvvvv -----
     function alarmMinimize() {
+        // The has alarm check has been added here to let other components call this function,
+        // without worrying about the alarmDialog popoing up without an alarm present.
+        // Look at the PowerItem as an example.
+        if ( ! vAlarmStatus.hasAlarm ) return
+
+
         _alarmDialog    .visible = false
         _alarmListDialog.visible = false
         _alarmBar       .visible = true
@@ -61,7 +67,7 @@
         // The has alarm check has been added here to let other components call this function,
         // without worrying about the alarmDialog popoing up without an alarm present.
         // Look at the PowerItem as an example.
-        if ( ! vAlarmStatus.hasAlarm ) return;
+        if ( ! vAlarmStatus.hasAlarm ) return
 
         if ( _root._DEBUG_DISABLE_MAXIMIZE_ ) {
             alarmMinimize()