summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-08-15 09:53:57 -0400
committerGravatar bunnei2014-08-15 09:53:57 -0400
commitd1c2b76ad1687c4ccf5673d593de3b7f8710a9c0 (patch)
treeb226b58f2ca96c584a72c2ab7e6fc7b63d56e7cc /src/citra_qt/bootmanager.cpp
parentMerge pull request #43 from archshift/iftree (diff)
parentBootmanager: changed `filename` to std::string (diff)
downloadyuzu-d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0.tar.gz
yuzu-d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0.tar.xz
yuzu-d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0.zip
Merge pull request #47 from archshift/stdstring
Bootmanager: changed `filename` to std::string
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r--src/citra_qt/bootmanager.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index a162e6dfe..b0aa1e561 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -17,13 +17,15 @@
17#define APP_TITLE APP_NAME " " APP_VERSION 17#define APP_TITLE APP_NAME " " APP_VERSION
18#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" 18#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
19 19
20EmuThread::EmuThread(GRenderWindow* render_window) : exec_cpu_step(false), cpu_running(false), render_window(render_window) 20EmuThread::EmuThread(GRenderWindow* render_window) :
21 exec_cpu_step(false), cpu_running(false),
22 render_window(render_window), filename("")
21{ 23{
22} 24}
23 25
24void EmuThread::SetFilename(const char* filename) 26void EmuThread::SetFilename(std::string filename)
25{ 27{
26 strcpy(this->filename, filename); 28 this->filename = filename;
27} 29}
28 30
29void EmuThread::run() 31void EmuThread::run()