[Performous-commit] Tapio Vierros : Fix crash when trying to enable pre-disabled webcam.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 085b849f444709fa0c3ccba90b82ec4e9932e689

Author: Tapio Vierros <tap...@gm...>
Date:   Wed May 12 21:03:30 2010 +0300

Fix crash when trying to enable pre-disabled webcam.

---

 game/screen_sing.cc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 2252fb1..07b0cb3 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -255,7 +255,10 @@ void ScreenSing::manageEvent(SDL_Event event) {
 		if (key == SDLK_w) dispInFlash(++config["game/pitch"]); // Toggle pitch wave
 		#ifdef USE_OPENCV
 		// Toggle webcam
-		if (key == SDLK_a) { dispInFlash(++config["graphic/webcam"]); m_cam->pause(!config["graphic/webcam"].b()); }
+		if (key == SDLK_a) {
+			if (!m_cam) m_cam.reset(new Webcam());
+			if (m_cam) { dispInFlash(++config["graphic/webcam"]); m_cam->pause(!config["graphic/webcam"].b()); }
+		}
 		#endif
 		// Latency settings
 		if (key == SDLK_F1) dispInFlash(--config["audio/video_delay"]);