src/scenes/startup_Scene.cpp

@@ -41,15 +41,26 @@ namespace scene
 	}
 
 	gui::Button* ConvertGuiTextureToButton(gui::GuiTexture* texture) {
+		gui::Button* button;
 		if (texture != NULL)
+		{
+
 			if (texture->GetType() == gui::GuiType::BUTTON) {
 				
-				gui::Button* button = (gui::Button*)texture;
+				button = (gui::Button*)texture;
 				return button;
 			}
 			else {
-				return NULL;
+				button = nullptr;
+				return button;
 			}
+		}
+		else {
+			button = nullptr;
+			return button;
+		}
+
+
 	}
 
 	/*gui::InteractableGui* ConvertGuiTextureToInteractableGui(gui::GuiTexture* texture) {