diff --git a/melonDS.cbp b/melonDS.cbp
index b517353d..3003b845 100644
--- a/melonDS.cbp
+++ b/melonDS.cbp
@@ -143,6 +143,8 @@
 		<Unit filename="src/libui_sdl/LAN_PCap.h" />
 		<Unit filename="src/libui_sdl/LAN_Socket.cpp" />
 		<Unit filename="src/libui_sdl/LAN_Socket.h" />
+		<Unit filename="src/libui_sdl/OSD.cpp" />
+		<Unit filename="src/libui_sdl/OSD.h" />
 		<Unit filename="src/libui_sdl/Platform.cpp" />
 		<Unit filename="src/libui_sdl/PlatformConfig.cpp" />
 		<Unit filename="src/libui_sdl/PlatformConfig.h" />
diff --git a/src/GPU2D.cpp b/src/GPU2D.cpp
index 212372c9..c51b2528 100644
--- a/src/GPU2D.cpp
+++ b/src/GPU2D.cpp
@@ -882,10 +882,12 @@ void GPU2D::VBlankEnd()
     OBJMosaicY = 0;
     OBJMosaicYMax = OBJMosaicSize[1];
 
-    // TODO: make optional
-    if ((Num == 0) && (CaptureCnt & (1<<31)) && (((CaptureCnt >> 29) & 0x3) != 1))
+    if (GPU3D::Renderer != 0)
     {
-        GPU3D::GLRenderer::PrepareCaptureFrame();
+        if ((Num == 0) && (CaptureCnt & (1<<31)) && (((CaptureCnt >> 29) & 0x3) != 1))
+        {
+            GPU3D::GLRenderer::PrepareCaptureFrame();
+        }
     }
 }