Fix issue when "minimize to systray" and "start minimized" are both enabled.

Window could not be restored.

src/mainwindow.cpp

@@ -255,9 +255,13 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
   readSettings();
 
   if (!ui_locked) {
-    if (pref.startMinimized() && systrayIcon)
+    if (pref.startMinimized() && systrayIcon) {
-      showMinimized();
+      show();
-    else {
+      minimizeWindow();
+      // XXX: Using showMinimized() makes it impossible to restore
+      // the window if "Minimize to systray" is enabled.
+      //showMinimized();
+    } else {
       show();
       activateWindow();
       raise();