From 167d16ded6230210d038aad8cda2d298d5be37a5 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sat, 30 Jan 2016 18:55:28 +0100
Subject: [PATCH] DVDInterface: Remove the SetLidOpen parameter

The lid must always be consistent with whether a disc is inserted.
Callers shouldn't be able to set inconsistent states.
---
 Source/Core/Core/HW/DVDInterface.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp
index 9a12876e57..797db5de3d 100644
--- a/Source/Core/Core/HW/DVDInterface.cpp
+++ b/Source/Core/Core/HW/DVDInterface.cpp
@@ -264,7 +264,7 @@ static void InsertDiscCallback(u64 userdata, s64 cyclesLate);
 static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late);
 
 void SetDiscInside(bool disc_inside);
-void SetLidOpen(bool open);
+void SetLidOpen();
 
 void UpdateInterrupts();
 void GenerateDIInterrupt(DIInterruptType _DVDInterrupt);
@@ -507,7 +507,7 @@ bool VolumeIsValid()
 
 void SetDiscInside(bool disc_inside)
 {
-  SetLidOpen(!disc_inside);
+  SetLidOpen();
 }
 
 bool IsDiscInside()
@@ -567,10 +567,10 @@ void ChangeDiscAsCPU(const std::string& new_path)
   Movie::SignalDiscChange(new_path);
 }
 
-void SetLidOpen(bool open)
+void SetLidOpen()
 {
   u32 old_value = s_DICVR.CVR;
-  s_DICVR.CVR = open ? 1 : 0;
+  s_DICVR.CVR = IsDiscInside() ? 0 : 1;
   if (s_DICVR.CVR != old_value)
     GenerateDIInterrupt(INT_CVRINT);
 }