Fixes for Windows

diff --git a/control.cc b/control.cc
index b19993e2bdfb94f9aa7d61db7d6ff1f2dd0b1c34..76fc49f4d4f0ab6c878a5e581ee844c532eca36f 100644 (file)
--- a/control.cc
+++ b/control.cc
@@ -132,6 +132,7 @@ bool Control::init(bool tcrashed)
         FALLTHROUGH
       case 1:
         FALLTHROUGH
+          ;
     }
 
     return false;

diff --git a/osdwinvector.cc b/osdwinvector.cc
index dd48b6cab0734044f3f2286290305ab5fb6b095a..9839817f9462846e180db10c1d2cd29a30dcec1f 100644 (file)
--- a/osdwinvector.cc
+++ b/osdwinvector.cc
@@ -17,14 +17,18 @@
     along with VOMP.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <wincodec.h>
 
+
+// FIXME swap these two lines around
 #include "videowin.h"
+#include <wincodec.h>
+
 #include "surfacewin.h"
 #include "message.h"
 #include "messagequeue.h"
 #include "teletxt/txtfont.h"
 
+
 #define  OSD_BUFFER_WIDTH 1280
 #define  OSD_BUFFER_HEIGHT 720
 

diff --git a/winmain.cc b/winmain.cc
index 1c910101d5a57c3c7c23d39b1ff3de5107c40494..e8f692fc96a506055f97c73b87aad29804418b66 100644 (file)
--- a/winmain.cc
+++ b/winmain.cc
@@ -45,6 +45,7 @@
 #include "osdwinvector.h"
 #endif
 #include "control.h"
+#include "message.h"
 #include "messagequeue.h"
 
 void sighandler(int signalReceived);
@@ -798,13 +799,6 @@ void shutdown(int code)
     logger->log("Core", Log::NOTICE, "Control module shut down");
   }
 
-  if (vdr)
-  {
-    vdr->shutdown();
-    delete vdr;
-    logger->log("Core", Log::NOTICE, "VDR module shut down");
-  }
-
   if (osd)
   {
     osd->shutdown();