diff options
| author | 2014-08-14 23:59:31 -0700 | |
|---|---|---|
| committer | 2014-08-14 23:59:31 -0700 | |
| commit | 6096b289b776678e3a6f938dddd7367f784a83fe (patch) | |
| tree | b226b58f2ca96c584a72c2ab7e6fc7b63d56e7cc /src/citra_qt/main.cpp | |
| parent | Merge pull request #43 from archshift/iftree (diff) | |
| download | yuzu-6096b289b776678e3a6f938dddd7367f784a83fe.tar.gz yuzu-6096b289b776678e3a6f938dddd7367f784a83fe.tar.xz yuzu-6096b289b776678e3a6f938dddd7367f784a83fe.zip | |
Bootmanager: changed `filename` to std::string
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 997e82cc9..e5190d48a 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -123,7 +123,7 @@ GMainWindow::~GMainWindow() | |||
| 123 | delete render_window; | 123 | delete render_window; |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | void GMainWindow::BootGame(const char* filename) | 126 | void GMainWindow::BootGame(std::string filename) |
| 127 | { | 127 | { |
| 128 | NOTICE_LOG(MASTER_LOG, "citra starting...\n"); | 128 | NOTICE_LOG(MASTER_LOG, "citra starting...\n"); |
| 129 | 129 | ||
| @@ -134,8 +134,7 @@ void GMainWindow::BootGame(const char* filename) | |||
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | // Load a game or die... | 136 | // Load a game or die... |
| 137 | std::string boot_filename = filename; | 137 | if (Loader::ResultStatus::Success != Loader::LoadFile(filename)) { |
| 138 | if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) { | ||
| 139 | ERROR_LOG(BOOT, "Failed to load ROM!"); | 138 | ERROR_LOG(BOOT, "Failed to load ROM!"); |
| 140 | } | 139 | } |
| 141 | 140 | ||