1 files changed, 29 insertions, 10 deletions

diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index f91f879..f8cdd24 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -405,8 +405,11 @@ void EmuThread::run()
                     videoRenderer = hasOGL ? Config::_3DRenderer : 0;
 
                 videoSettingsDirty = false;
+
                 videoSettings.Soft_Threaded = Config::Threaded3D != 0;
                 videoSettings.GL_ScaleFactor = Config::GL_ScaleFactor;
+                videoSettings.GL_BetterPolygons = Config::GL_BetterPolygons;
+
                 GPU::SetRenderSettings(videoRenderer, videoSettings);
             }
 
@@ -1333,7 +1336,7 @@ void MainWindow::dragEnterEvent(QDragEnterEvent* event)
     QString filename = urls.at(0).toLocalFile();
     QString ext = filename.right(3);
 
-    if (ext == "nds" || ext == "srl" || (ext == "gba" && RunningSomething))
+    if (ext == "nds" || ext == "srl" || ext == "dsi" || (ext == "gba" && RunningSomething))
         event->acceptProposedAction();
 }
 
@@ -1747,14 +1750,14 @@ void MainWindow::onAudioSettingsFinished(int res)
 
 void MainWindow::onOpenWifiSettings()
 {
+    emuThread->emuPause();
+
     WifiSettingsDialog* dlg = WifiSettingsDialog::openDlg(this);
     connect(dlg, &WifiSettingsDialog::finished, this, &MainWindow::onWifiSettingsFinished);
 }
 
 void MainWindow::onWifiSettingsFinished(int res)
 {
-    emuThread->emuPause();
-
     if (Wifi::MPInited)
     {
         Platform::MP_DeInit();
@@ -1764,6 +1767,9 @@ void MainWindow::onWifiSettingsFinished(int res)
     Platform::LAN_DeInit();
     Platform::LAN_Init();
 
+    if (WifiSettingsDialog::needsReset)
+        onReset();
+
     emuThread->emuUnpause();
 }
 
@@ -1874,14 +1880,27 @@ void MainWindow::onTitleUpdate(QString title)
 
 void MainWindow::onEmuStart()
 {
-    for (int i = 1; i < 9; i++)
+    // TODO: make savestates work in DSi mode!!
+    if (Config::ConsoleType == 1)
     {
-        actSaveState[i]->setEnabled(true);
-        actLoadState[i]->setEnabled(Frontend::SavestateExists(i));
+        for (int i = 0; i < 9; i++)
+        {
+            actSaveState[i]->setEnabled(false);
+            actLoadState[i]->setEnabled(false);
+        }
+        actUndoStateLoad->setEnabled(false);
+    }
+    else
+    {
+        for (int i = 1; i < 9; i++)
+        {
+            actSaveState[i]->setEnabled(true);
+            actLoadState[i]->setEnabled(Frontend::SavestateExists(i));
+        }
+        actSaveState[0]->setEnabled(true);
+        actLoadState[0]->setEnabled(true);
+        actUndoStateLoad->setEnabled(false);
     }
-    actSaveState[0]->setEnabled(true);
-    actLoadState[0]->setEnabled(true);
-    actUndoStateLoad->setEnabled(false);
 
     actPause->setEnabled(true);
     actPause->setChecked(false);
@@ -2066,7 +2085,7 @@ int main(int argc, char** argv)
         char* file = argv[1];
         char* ext = &file[strlen(file)-3];
 
-        if (!strcasecmp(ext, "nds") || !strcasecmp(ext, "srl"))
+        if (!strcasecmp(ext, "nds") || !strcasecmp(ext, "srl") || !strcasecmp(ext, "dsi"))
         {
             int res = Frontend::LoadROM(file, Frontend::ROMSlot_NDS);