From 590ab2ac2bdc79e536c0f332cf9f1a4d700fffe9 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Thu, 28 May 2020 22:37:37 +0200
Subject: [PATCH] fix things

---
 src/frontend/qt_sdl/CMakeLists.txt |  4 ++++
 src/frontend/qt_sdl/main.cpp       | 21 +++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index 0b7fa547..dbc1e3a8 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -7,7 +7,10 @@ SET(SOURCES_QT_SDL
 	InputConfigDialog.cpp
 	VideoSettingsDialog.cpp
 	AudioSettingsDialog.cpp
+	WifiSettingsDialog.cpp
 	Input.cpp
+	LAN_PCap.cpp
+	LAN_Socket.cpp
 	OSD.cpp
 	OSD_shaders.h
 	font.h
@@ -40,6 +43,7 @@ pkg_check_modules(SDL2 REQUIRED sdl2)
 
 add_executable(melonDS ${SOURCES_QT_SDL})
 target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
+target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
 target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
 target_link_libraries(melonDS core ${SDL2_LIBRARIES})
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index bea33b07..e60a58d4 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -38,6 +38,7 @@
 #include "InputConfigDialog.h"
 #include "VideoSettingsDialog.h"
 #include "AudioSettingsDialog.h"
+#include "WifiSettingsDialog.h"
 
 #include "types.h"
 #include "version.h"
@@ -298,9 +299,10 @@ void EmuThread::initOpenGL()
     oglContext->moveToThread(this);
 }
 
-void deinitOpenGL()
+void EmuThread::deinitOpenGL()
 {
-    // TODO!!
+    delete oglContext;
+    delete oglSurface;
 }
 
 void* oglGetProcAddress(const char* proc)
@@ -545,16 +547,11 @@ void EmuThread::run()
     NDS::DeInit();
     //Platform::LAN_DeInit();
 
-    /*if (Screen_UseGL)
-    {
-        OSD::DeInit(true);
-        GLScreen_DeInit();
-    }
-    else
-        OSD::DeInit(false);*/
-
     if (hasOGL)
+    {
         oglContext->doneCurrent();
+        deinitOpenGL();
+    }
 }
 
 void EmuThread::changeWindowTitle(char* title)
@@ -844,7 +841,6 @@ void ScreenPanelGL::initializeGL()
     screenShader->addShaderFromSourceCode(QOpenGLShader::Fragment, kScreenFS);
 
     GLuint pid = screenShader->programId();
-    printf("program: %d\n", pid);
     glBindAttribLocation(pid, 0, "vPosition");
     glBindAttribLocation(pid, 1, "vTexcoord");
     glBindFragDataLocation(pid, 0, "oColor");
@@ -1675,7 +1671,7 @@ void MainWindow::onAudioSettingsFinished(int res)
 
 void MainWindow::onOpenWifiSettings()
 {
-    //
+    WifiSettingsDialog::openDlg(this);
 }
 
 void MainWindow::onChangeSavestateSRAMReloc(bool checked)
@@ -1822,6 +1818,7 @@ void MainWindow::onUpdateVideoSettings(bool glchange)
     {
         emuThread->emuPause();
 
+        if (hasOGL) emuThread->deinitOpenGL();
         delete panel;
         createScreenPanel();
         connect(emuThread, SIGNAL(windowUpdate()), panel, SLOT(update()));