v0.8.962

yoRadio/src/core/mqtt.h

@@ -1,8 +1,9 @@
 #ifndef mqtt_h
 #define mqtt_h
-
-#if __has_include("../../mqttoptions.h")
-#include "../../mqttoptions.h"
+#include "options.h"
+#ifdef MQTT_ROOT_TOPIC
+//#if __has_include("../../mqttoptions.h")
+//#include "../../mqttoptions.h"
 #include "../async-mqtt-client/AsyncMqttClient.h"
 
 
@@ -15,7 +16,7 @@ void mqttPublishStatus();
 void mqttPublishPlaylist();
 void mqttPublishVolume();
 
-#endif // if __has_include("mqttoptions.h")
+#endif // #ifdef MQTT_ROOT_TOPIC
 
 
 #endif

yoRadio/src/core/options.h

@@ -1,7 +1,7 @@
 #ifndef options_h
 #define options_h
 
-#define YOVERSION "0.8.950"
+#define YOVERSION "0.8.962"
 
 /*******************************************************
 DO NOT EDIT THIS FILE. 
@@ -15,7 +15,9 @@ STORE YOUR SETTINGS IN THE *** myoptions.h *** FILE.
 #if __has_include("../../mytheme.h")
   #include "../../mytheme.h"            /* <- Theme file */
 #endif
-
+#if __has_include("../../mqttoptions.h")
+  #include "../../mqttoptions.h"
+#endif
 /*******************************************************
 
 The connection tables are located here https://github.com/e2002/yoradio#connection-tables

yoRadio/src/core/player.cpp

@@ -181,7 +181,7 @@ void Player::browseUrl(){
   config.setDspOn(1);
   resumeAfterUrl = mode==PLAYING;
   display.putRequest(PSTOP);
-  setDefaults();
+//  setDefaults();
   setOutputPins(false);
   config.setTitle(const_PlConnect);
   netserver.requestOnChange(TITLE, 0);