diff options
| author | erihel <erihel@gmail.com> | 2013-03-17 19:01:32 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-03-17 19:01:32 +0100 |
| commit | d6bbc99c90ef586b041651d373524b30fe6c8676 (patch) | |
| tree | e01eee683dc4e693450769a441a37c9d070b97d1 /src/ui/displayinfo.cpp | |
| parent | 9f5bef030d97e9ee20d8c635335fdafd854fed44 (diff) | |
| download | colobot-d6bbc99c90ef586b041651d373524b30fe6c8676.tar.gz colobot-d6bbc99c90ef586b041651d373524b30fe6c8676.tar.bz2 colobot-d6bbc99c90ef586b041651d373524b30fe6c8676.zip | |
* Changed file loading to fix issue #73
* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform
Diffstat (limited to 'src/ui/displayinfo.cpp')
| -rw-r--r-- | src/ui/displayinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 9a31956..5c41f65 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -671,7 +671,7 @@ void CDisplayInfo::ChangeIndexButton(int index) { filename = m_main->GetDisplayInfoName(m_index); edit->ReadText(filename); - edit->HyperHome(filename); + edit->HyperHome(std::string(filename)); SetPosition(m_main->GetDisplayInfoPosition(m_index)); } |