Merge pull request #2367 from skidau/GCPad-Recalibrate-forced

Skipped the calibration of the GC controller if it has already been calibrated.
dolphin-emu · May 6, 2015 · a7e2425 · a7e2425
2 parents 41f1683 + 06bca52
commit a7e2425
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/HW/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI_DeviceGCController.cpp
@@ -78,7 +78,8 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
 		{
 			INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
 
-			Calibrate();
+			if (!m_Calibrated)
+				Calibrate();
 
 			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
 			for (int i = 0; i < (int)sizeof(SOrigin); i++)