summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-04 11:09:07 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-04 11:09:07 (GMT)
commitab8466e9908d3982d498b63197bb80ffb489f3c1 (patch)
tree3e1e820b83e3feb27d3fec0fd02e43dc1967c2a9 /src
parentbaf07e470e50905148784eb6008cf69878440dfa (diff)
downloadpowder-ab8466e9908d3982d498b63197bb80ffb489f3c1.zip
powder-ab8466e9908d3982d498b63197bb80ffb489f3c1.tar.gz
Search window is persistent, issue #66
Diffstat (limited to 'src')
-rw-r--r--src/game/GameController.cpp3
-rw-r--r--src/search/SearchController.cpp2
2 files changed, 3 insertions, 2 deletions
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()