From 08a135de781e6ef52f201a3290dd01d69a47f919 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Tue, 6 Jun 2017 21:45:59 +0100
Subject: [PATCH] sort out ftw

---
 openlp/core/ui/firsttimeform.py        | 6 ------
 openlp/core/ui/mainwindow.py           | 2 +-
 openlp/plugins/remotes/remoteplugin.py | 7 ++++++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 9c2eaa605..cc7668587 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -34,7 +34,6 @@ from configparser import ConfigParser, MissingSectionHeaderError, NoSectionError
 
 from PyQt5 import QtCore, QtWidgets
 
-from openlp.plugins.remotes.deploy import download_and_check
 from openlp.core.common import Registry, RegistryProperties, AppLocation, Settings, check_directory_exists, \
     translate, clean_button_text, trace_error_handler
 from openlp.core.lib import PluginStatus, build_icon
@@ -595,11 +594,6 @@ class FirstTimeForm(QtWidgets.QWizard, UiFirstTimeWizard, RegistryProperties):
                                     os.path.join(themes_destination, theme),
                                     sha256):
                     missed_files.append('Theme: {name}'.format(name=theme))
-        if self.remote_check_box.isChecked():
-            self._increment_progress_bar(self.downloading.format(
-                name=translate('OpenLP.FirstTimeWizard', 'Downloading Web Application')), 0)
-            self.previous_size = 0
-            download_and_check(self)
         if missed_files:
             file_list = ''
             for entry in missed_files:
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index db21f2f56..702744961 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -516,7 +516,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
         Settings().set_up_default_values()
         self.about_form = AboutForm(self)
         MediaController()
-        if Registry().get_flag('webServer'):
+        if Registry().get_flag('no_web_server'):
             websockets.WebSocketServer()
             server.HttpServer()
         SettingsForm(self)
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index 82de554d7..a5251d94b 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -81,5 +81,10 @@ class RemotesPlugin(Plugin, OpenLPMixin):
             'title': translate('RemotePlugin', 'Web Remote', 'container title')
         }
 
-    def manage_download(self):
+    def first_time(self):
+        """
+        Import web site code if active
+        """
+        self.application.process_events()
         download_and_check()
+        self.application.process_events()