lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add string messages to returned result codes to display to user

Browse Source 
* Most of the main entry points that can fail with relevant reasons now has a
  way of specifying a message to return with it. This message can be displayed
  to the user to give more information or context about an error.
This commit is contained in:
baldurk
2022-04-26 16:21:54 +01:00
parent 10dd4c194c
commit 8aa0390948
145 changed files with 2978 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/RemoteHost.cpp
+8 -13
View File
@@ -128,7 +128,7 @@ void RemoteHost::CheckStatus()
UpdateStatus(RENDERDOC_CheckRemoteServerConnection(m_hostname));
}
ReplayStatus RemoteHost::Connect(IRemoteServer **server)
ResultDetails RemoteHost::Connect(IRemoteServer **server)
{
QMutexLocker autolock(&m_data->mutex);
return RENDERDOC_CreateRemoteServerConnection(m_hostname, server);
@@ -148,23 +148,23 @@ void RemoteHost::SetShutdown()
m_data->m_busy = false;
}
void RemoteHost::UpdateStatus(ReplayStatus status)
void RemoteHost::UpdateStatus(ResultDetails result)
{
{
QMutexLocker autolock(&m_data->mutex);
if(status == ReplayStatus::Succeeded)
if(result.code == ResultCode::Succeeded)
{
m_data->m_serverRunning = true;
m_data->m_versionMismatch = m_data->m_busy = false;
}
else if(status == ReplayStatus::NetworkRemoteBusy)
else if(result.code == ResultCode::NetworkRemoteBusy)
{
m_data->m_serverRunning = true;
m_data->m_busy = true;
m_data->m_versionMismatch = false;
}
else if(status == ReplayStatus::NetworkVersionMismatch)
else if(result.code == ResultCode::NetworkVersionMismatch)
{
m_data->m_serverRunning = true;
m_data->m_busy = true;
@@ -186,16 +186,11 @@ void RemoteHost::UpdateStatus(ReplayStatus status)
QThread::msleep(15);
}
ReplayStatus RemoteHost::Launch()
ResultDetails RemoteHost::Launch()
{
ReplayStatus status = ReplayStatus::Succeeded;
if(m_protocol)
{
// this is blocking
status = m_protocol->StartRemoteServer(m_hostname);
return status;
}
return m_protocol->StartRemoteServer(m_hostname);
rdcstr run = RunCommand();
@@ -204,7 +199,7 @@ ReplayStatus RemoteHost::Launch()
process.waitForFinished(2000);
process.detach();
return status;
return {ResultCode::Succeeded};
}
bool RemoteHost::IsServerRunning() const