Merge pull request #174 from csharpee/bugsbunny

Fixed Bug with Startup Animations + Added optimized animations

src/connection.cpp

@@ -23,7 +23,8 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, RPC* rpc) {
     QMovie *movie2 = new QMovie(":/img/res/silentdragon-animated-startup-dark.gif");;
     auto theme = Settings::getInstance()->get_theme_name();
     auto size  = QSize(512,512);
-    if (theme == "dark" || "midnight") {
+
+    if (theme == "dark" || theme == "midnight") {
         movie2->setScaledSize(size);
         connD->topIcon->setMovie(movie2);
         movie2->start();

src/rpc.cpp

@@ -1222,7 +1222,7 @@ void RPC::shutdownZcashd() {
     QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated.gif");;
     QMovie *movie2 = new QMovie(":/img/res/silentdragon-animated-dark.gif");;
     auto theme = Settings::getInstance()->get_theme_name();
-    if (theme == "dark" || "midnight") {
+    if (theme == "dark" || theme == "midnight") {
         movie2->setScaledSize(QSize(512,512));
         connD.topIcon->setMovie(movie2);
         movie2->start();

src/sendtab.cpp

@@ -715,7 +715,7 @@ void MainWindow::sendButton() {
         QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated.gif");;
         QMovie *movie2 = new QMovie(":/img/res/silentdragon-animated-dark.gif");;
         auto theme = Settings::getInstance()->get_theme_name();
-        if (theme == "dark" || "midnight") {
+        if (theme == "dark" || theme == "midnight") {
             movie2->setScaledSize(QSize(512,512));
             connD->topIcon->setMovie(movie2);
             movie2->start();