From ab8466e9908d3982d498b63197bb80ffb489f3c1 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Sat, 4 Aug 2012 12:09:07 +0100 Subject: Search window is persistent, issue #66 diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 7e5d930..e39b47b 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -587,7 +587,8 @@ void GameController::SetActiveTool(int toolSelection, Tool * tool) void GameController::OpenSearch() { - search = new SearchController(new SearchCallback(this)); + if(!search) + search = new SearchController(new SearchCallback(this)); ui::Engine::Ref().ShowWindow(search->GetView()); } diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp index 14d7e72..13a252a 100644 --- a/src/search/SearchController.cpp +++ b/src/search/SearchController.cpp @@ -76,7 +76,7 @@ void SearchController::Exit() } if(callback) callback->ControllerExit(); - HasExited = true; + //HasExited = true; } SearchController::~SearchController() -- cgit v0.9.2-21-gd62e