Desktop: fix some minor screen split issues

Author: Hydr8gon

src/desktop/noo_canvas.cpp

@@ -72,6 +72,13 @@ NooCanvas::NooCanvas(NooFrame *frame): CANVAS_CLASS(frame, wxID_ANY, CANVAS_PARA
     SetFocus();
 }
 
+NooCanvas::~NooCanvas()
+{
+    // Free the framebuffer if it was allocated
+    if (frame->mainFrame)
+        delete[] framebuffer;
+}
+
 void NooCanvas::drawScreen(int x, int y, int w, int h, int wb, int hb, uint32_t *buf)
 {
 #ifdef USE_GL_CANVAS
@@ -165,8 +172,9 @@ void NooCanvas::draw(wxPaintEvent &event)
         else if (frame->partner)
         {
             // Draw one of the DS screens
-            drawScreen(layout.topX, layout.topY, layout.topWidth, layout.topHeight, 256 << shift,
-               192 << shift, &framebuffer[!frame->mainFrame * ((256 * 192) << (shift * 2))]);
+            bool bottom = !frame->mainFrame ^ (ScreenLayout::screenSizing == 2);
+            drawScreen(layout.topX, layout.topY, layout.topWidth, layout.topHeight,
+               256 << shift, 192 << shift, &framebuffer[bottom * ((256 * 192) << (shift * 2))]);
         }
         else
         {

src/desktop/noo_canvas.h

@@ -43,6 +43,8 @@ class NooCanvas: public CANVAS_CLASS
         bool gbaMode = false;
 
         NooCanvas(NooFrame *frame);
+        ~NooCanvas();
+
         void resetFrame() { sizeReset = 2; }
         void finish() { finished = true; }
 

src/desktop/noo_frame.cpp

@@ -250,6 +250,7 @@ void NooFrame::Refresh()
             // Create the partner frame if needed
             partner = new NooFrame(app, id, "", this);
             partner->core = core;
+            partner->running = running;
         }
         else if (!split && partner)
         {
@@ -811,13 +812,13 @@ void NooFrame::dropFiles(wxDropFilesEvent &event)
     if (event.GetNumberOfFiles() != 1) return;
     wxString path = event.GetFiles()[0];
     if (!wxFileExists(path)) return;
-    loadRomPath((const char*)path.mb_str(wxConvUTF8));
+    (mainFrame ? this : partner)->loadRomPath((const char*)path.mb_str(wxConvUTF8));
 }
 
 void NooFrame::close(wxCloseEvent &event)
 {
     // Properly shut down the emulator
-    mainFrame ? stopCore(true) : partner->stopCore(true);
+    (mainFrame ? this : partner)->stopCore(true);
     app->removeFrame(id);
     canvas->finish();
     if (partner) delete partner;