Merge remote-tracking branch 'remotes/origin/master' into melonDSi

1 files changed, 5 insertions, 11 deletions

diff --git a/src/GPU2D.cpp b/src/GPU2D.cpp
index 1c6cf0c..604a4ee 100644
--- a/src/GPU2D.cpp
+++ b/src/GPU2D.cpp
@@ -202,16 +202,8 @@ void GPU2D::DoSavestate(Savestate* file)
         file->Var32(&CaptureCnt);
     }
 
-    if (file->IsAtleastVersion(2, 1))
-    {
-        file->Var32(&Win0Active);
-        file->Var32(&Win1Active);
-    }
-    else
-    {
-        Win0Active = 0;
-        Win1Active = 0;
-    }
+    file->Var32(&Win0Active);
+    file->Var32(&Win1Active);
 
     if (!file->Saving)
     {
@@ -232,7 +224,7 @@ void GPU2D::SetFramebuffer(u32* buf)
     Framebuffer = buf;
 }
 
-void GPU2D::SetDisplaySettings(bool accel)
+void GPU2D::SetRenderSettings(bool accel)
 {
     Accelerated = accel;
 
@@ -728,6 +720,8 @@ u32 GPU2D::ColorComposite(int i, u32 val1, u32 val2)
     case 3: return ColorBrightnessDown(val1, EVY);
     case 4: return ColorBlend5(val1, val2);
     }
+
+    return val1;
 }