Head and 2.2

openlp/.version

@@ -1 +1 @@
-2.1.6
+2.2

openlp/core/ui/maindisplay.py

@@ -173,6 +173,19 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
             Registry().register_function('live_display_hide', self.hide_display)
             Registry().register_function('live_display_show', self.show_display)
             Registry().register_function('update_display_css', self.css_changed)
+        self.close_display = False
+
+    def closeEvent(self, event):
+        """
+        Catch the close event, and check that the close event is triggered by OpenLP closing the display.
+        On Windows this event can be triggered by pressing ALT+F4, which we want to ignore.
+
+        :param event: The triggered event
+        """
+        if self.close_display:
+            super().closeEvent(event)
+        else:
+            event.ignore()
 
     def close(self):
         """
@@ -182,6 +195,7 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
             Registry().remove_function('live_display_hide', self.hide_display)
             Registry().remove_function('live_display_show', self.show_display)
             Registry().remove_function('update_display_css', self.css_changed)
+        self.close_display = True
         super().close()
 
     def set_transparency(self, enabled):

openlp/core/utils/__init__.py

@@ -404,6 +404,7 @@ def get_web_page(url, header=None, update_openlp=False):
         try:
             page = urllib.request.urlopen(req, timeout=CONNECTION_TIMEOUT)
             log.debug('Downloaded page {}'.format(page.geturl()))
+            break
         except urllib.error.URLError as err:
             log.exception('URLError on {}'.format(url))
             log.exception('URLError: {}'.format(err.reason))

tests/utils/test_bzr_tags.py

@@ -49,7 +49,8 @@ TAGS = [
     ['2.1.3', '2513'],
     ['2.1.4', '2532'],
     ['2.1.5', '2543'],
-    ['2.1.6', '2550']
+    ['2.1.6', '2550'],
+    ['2.2', '2562']
 ]
 # Depending on the repository, we sometimes have the 2.0.x tags in the repo too. They come up with a revision number of
 # "?", which I suspect is due to the fact that we're using shared repositories. This regular expression matches all