mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Nekotekina 2014-09-08 21:06:08 +04:00
parent 5d951451c5
commit c79b52b334
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/SysCalls/LogBase.cpp
View File

@ -34,21 +34,21 @@ void LogBase::LogOutput(LogType type, const u32 id, const char* info, const std:
hle::error::error(s32 errorCode, const char* errorText) hle::error::error(s32 errorCode, const char* errorText)
: code(errorCode) : code(errorCode)
, base(nullptr) , base(nullptr)
, text(errorText) , text(errorText ? errorText : "")
{ {
} }
hle::error::error(s32 errorCode, const LogBase& errorBase, const char* errorText) hle::error::error(s32 errorCode, const LogBase& errorBase, const char* errorText)
: code(errorCode) : code(errorCode)
, base(&errorBase) , base(&errorBase)
, text(errorText) , text(errorText ? errorText : "")
{ {
} }
hle::error::error(s32 errorCode, const LogBase* errorBase, const char* errorText) hle::error::error(s32 errorCode, const LogBase* errorBase, const char* errorText)
: code(errorCode) : code(errorCode)
, base(errorBase) , base(errorBase)
, text(errorText) , text(errorText ? errorText : "")
{ {
} }

11
rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
View File

@ -127,19 +127,12 @@ int cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
if (callback && (g_msg_dialog_state != msgDialogAbort)) if (callback && (g_msg_dialog_state != msgDialogAbort))
callback.async((s32)status, userData); // TODO: this callback should be registered callback.async((s32)status, userData); // TODO: this callback should be registered
CallAfter([&m_signal]() CallAfter([]()
{ {
MsgDialogDestroy(); MsgDialogDestroy();
m_signal = false; g_msg_dialog_state = msgDialogNone;
}); });
while (m_signal)
{
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
g_msg_dialog_state = msgDialogNone;
}); });
t.detach(); t.detach();