openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/media_icon into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1063208 in OpenLP: "Media Plugin does not display an Icon for items on list"
  https://bugs.launchpad.net/openlp/+bug/1063208
  Bug #1065445 in OpenLP: "Empty alert sent from remote blocks alert display for some seconds"
  https://bugs.launchpad.net/openlp/+bug/1065445

For more details, see:
https://code.launchpad.net/~trb143/openlp/media_icon/+merge/129551

If text messing do not display the alert

-- 
https://code.launchpad.net/~trb143/openlp/media_icon/+merge/129551
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/media_icon into lp:openlp.

=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py	2012-06-22 14:14:53 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py	2012-10-13 07:36:22 +0000
@@ -57,8 +57,6 @@
         """
         if message:
             self.displayAlert(message[0])
-        else:
-            self.displayAlert(u'')
 
     def displayAlert(self, text=u''):
         """
@@ -68,14 +66,15 @@
             display text
         """
         log.debug(u'display alert called %s' % text)
-        self.alertList.append(text)
-        if self.timer_id != 0:
-            Receiver.send_message(u'mainwindow_status_text',
-                translate('AlertsPlugin.AlertsManager',
-                'Alert message created and displayed.'))
-            return
-        Receiver.send_message(u'mainwindow_status_text', u'')
-        self.generateAlert()
+        if text:
+            self.alertList.append(text)
+            if self.timer_id != 0:
+                Receiver.send_message(u'mainwindow_status_text',
+                    translate('AlertsPlugin.AlertsManager',
+                    'Alert message created and displayed.'))
+                return
+            Receiver.send_message(u'mainwindow_status_text', u'')
+            self.generateAlert()
 
     def generateAlert(self):
         """