Windows icon and fixes

diff --git a/minitube.ico b/minitube.ico
new file mode 100644 (file)
index 0000000..9a3acbe
Binary files /dev/null and b/minitube.ico differ

diff --git a/minitube.pro b/minitube.pro
index e83f364e4821a4a1ab87e17b765482c461dcbada..c5150fdbe1e77c48246d9652b337830bd2d146fe 100755 (executable)
--- a/minitube.pro
+++ b/minitube.pro
@@ -120,3 +120,6 @@ unix {
     icon128.path = $$DATADIR/icons/hicolor/128x128/apps
     icon128.files += data/128x128/minitube.png
 }
+win32 {
+    RC_FILE = minitube.rc
+}

diff --git a/minitube.rc b/minitube.rc
new file mode 100644 (file)
index 0000000..2c1795b
--- /dev/null
+++ b/minitube.rc
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON    DISCARDABLE     "minitube.ico"
+

diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index 08173c5b2831e3bd8c2309b92de599a59559a4cb..d5b5ec17afea25b2d99d70ea907a8d32f0622ab6 100644 (file)
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -187,10 +187,12 @@ void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/)
         // but Phonon on Linux needs a little more help to start playback
         if (!reallyStopped) mediaObject->play();
 
+#ifdef Q_WS_MAC
         // Workaround for Mac playback start problem
         if (!timerPlayFlag) {
             workaroundTimer->start();
         }
+#endif
 
         break;