Merge branch 'master' into Narry's_Mod

# Conflicts: # Source/Core/DolphinQt/RenderWidget.cpp
redscientistlabs · Sep 22, 2018 · 1d33f67 · 1d33f67
2 parents 15d60d2 + 1bb8df8
commit 1d33f67
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
@@ -1243,11 +1243,7 @@ void MainWindow::dropEvent(QDropEvent* event)
     return;
   }
 
-  if (file_info.isFile())
-  {
-    StartGame(path);
-  }
-  else
+  if (!file_info.isFile())
   {
     auto& settings = Settings::Instance();
 
@@ -1261,6 +1257,10 @@ void MainWindow::dropEvent(QDropEvent* event)
     }
     settings.AddPath(path);
   }
+  else
+  {
+    StartGame(path);
+  }
 }
 
 QSize MainWindow::sizeHint() const

diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp
@@ -110,10 +110,12 @@ void RenderWidget::dropEvent(QDropEvent* event)
     return;
   }
 
-  if (file_info.isFile())
+  if (!file_info.isFile())
   {
-    State::LoadAs(path.toStdString());
+    return;
   }
+
+  State::LoadAs(path.toStdString());
 }
 
 void RenderWidget::OnHideCursorChanged()