Clean-up getWebClientUrl a bit

src/settings/SettingsComponent.cpp

@@ -710,12 +710,11 @@ bool SettingsComponent::resetAndSaveOldConfiguration()
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-QString SettingsComponent::getWebClientUrl()
+QString SettingsComponent::getWebClientUrl(bool desktop)
 {
-  auto mode = SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "webMode").toString();
   QString url;
 
-  if (mode == "desktop")
+  if (desktop)
     url = SettingsComponent::Get().value(SETTINGS_SECTION_PATH, "startupurl_desktop").toString();
   else
     url = SettingsComponent::Get().value(SETTINGS_SECTION_PATH, "startupurl_tv").toString();
@@ -729,7 +728,7 @@ QString SettingsComponent::getWebClientUrl()
 
   if (url == "bundled")
   {
-    auto path = Paths::webClientPath(mode);
+    auto path = Paths::webClientPath(desktop ? "desktop" : "tv");
     if (path.startsWith("/"))
       url = "file://" + path;
     url = "file:///" + path;

src/settings/SettingsComponent.h

@@ -57,7 +57,7 @@ public:
   Q_INVOKABLE void resetToDefaultAll();
   Q_INVOKABLE void resetToDefault(const QString& sectionID);
   Q_INVOKABLE QVariantList settingDescriptions();
-  Q_INVOKABLE QString getWebClientUrl();
+  Q_INVOKABLE QString getWebClientUrl(bool desktop);
 
   // host commands
   Q_SLOT Q_INVOKABLE void cycleSetting(const QString& args);

src/ui/KonvergoWindow.cpp

@@ -79,6 +79,9 @@ KonvergoWindow::KonvergoWindow(QWindow* parent) :
   connect(&UpdaterComponent::Get(), &UpdaterComponent::downloadComplete,
           this, &KonvergoWindow::showUpdateDialog);
 
+  connect(this, &KonvergoWindow::webDesktopModeChanged,
+          &PlayerComponent::Get(), &PlayerComponent::stop);
+
 #ifdef Q_OS_MAC
   m_osxPresentationOptions = 0;
 #endif
@@ -337,9 +340,7 @@ void KonvergoWindow::updateMainSectionSettings(const QVariantMap& values)
   }
 
   if (values.contains("startupurl"))
-  {
     emit webUrlChanged();
-  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -565,7 +566,7 @@ QScreen* KonvergoWindow::loadLastScreen()
 /////////////////////////////////////////////////////////////////////////////////////////
 QString KonvergoWindow::webUrl()
 {
-  auto url = SettingsComponent::Get().getWebClientUrl();
+  auto url = SettingsComponent::Get().getWebClientUrl(m_webDesktopMode);
   if (m_webDesktopMode)
     return url;