From 76cfd74898b8bf98d7c647ced617685e437e3dcf Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Wed, 25 Jan 2017 19:56:22 +0100
Subject: [PATCH] Improve Application::eraseSurface()

---
 src/Application/Application.cpp                 | 5 +++--
 src/Application/Modes/ProjectionMappingMode.cpp | 8 +-------
 src/Application/Modes/ProjectionMappingMode.h   | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp
index 7f6c39b..a6d81e5 100644
--- a/src/Application/Application.cpp
+++ b/src/Application/Application.cpp
@@ -211,8 +211,9 @@ void Application::createSurface(SurfaceType type){
 }
 
 void Application::eraseSurface(int i){
-	getCmdManager()->exec(
-		new RmSurfaceCmd(getSurfaceManager(), i));
+	if(i >= 0 && i < getSurfaceManager()->getActivePreset()->getSurfaces().size()){
+		getCmdManager()->exec(new RmSurfaceCmd(getSurfaceManager(), i));
+	}
 }
 
 void Application::setInfoText(string text){
diff --git a/src/Application/Modes/ProjectionMappingMode.cpp b/src/Application/Modes/ProjectionMappingMode.cpp
index 07a4a15..509a0f3 100644
--- a/src/Application/Modes/ProjectionMappingMode.cpp
+++ b/src/Application/Modes/ProjectionMappingMode.cpp
@@ -69,13 +69,7 @@ void ProjectionMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & arg
 		 break;
 
 	 case OF_KEY_BACKSPACE:
-		 if(app->getSurfaceManager()->getSelectedSurface() == 0){
-			break;
-		 }
-		 app->getCmdManager()->exec(
-			 new RmSurfaceCmd(
-				app->getSurfaceManager(),
-				app->getSurfaceManager()->getSelectedSurfaceIndex()));
+		 app->eraseSurface(app->getSurfaceManager()->getSelectedSurfaceIndex());
 		 break;
 	 
 	 case 'p':
diff --git a/src/Application/Modes/ProjectionMappingMode.h b/src/Application/Modes/ProjectionMappingMode.h
index 57a0eee..fcc99b4 100644
--- a/src/Application/Modes/ProjectionMappingMode.h
+++ b/src/Application/Modes/ProjectionMappingMode.h
@@ -5,7 +5,6 @@
 #include "ofLog.h"
 #include "ofGraphics.h"
 #include "AddSurfaceCmd.h"
-#include "RmSurfaceCmd.h"
 #include "AddGridRowCmd.h"
 #include "RmGridRowCmd.h"
 #include "AddGridColCmd.h"