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

Fix some edge cases when handling unsaved captures. Closes #2554

Browse Source 
* The 'no to all' option should always be present if there are multiple unsaved
  captures across the connections, even if the current connection only has one
  capture and so otherwise wouldn't have a 'no to all' option.
* The 'no to all' option will always discard all unsaved captures in all
  connections when closing the window, if the user clicks no on the confirmation
  of this, abort the close operation entirely and let them decide how to handle
  it (e.g. discarding/saving captures in connections individually).
This commit is contained in:
baldurk
2022-04-18 17:06:44 +01:00
parent 26585e9a1b
commit dee3c37d90
3 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/MainWindow.cpp
+36 -36
View File
@@ -1954,6 +1954,9 @@ void MainWindow::FillRemotesMenu(QMenu *menu, bool includeLocalhost)
void MainWindow::setRemoteHost(int hostIdx)
{
if(!PromptCloseCapture())
return;
rdcarray<RemoteHost> hosts = m_Ctx.Config().GetRemoteHosts();
RemoteHost host;
@@ -1962,7 +1965,13 @@ void MainWindow::setRemoteHost(int hostIdx)
bool noToAll = false;
for(LiveCapture *live : m_LiveCaptures)
QList<LiveCapture *> liveCaptures = m_LiveCaptures;
int unsavedCaps = 0;
for(LiveCapture *live : liveCaptures)
unsavedCaps += live->unsavedCaptureCount();
for(LiveCapture *live : liveCaptures)
{
// allow live captures to this host to stay open, that way
// we can connect to a live capture, then switch into that
@@ -1971,24 +1980,12 @@ void MainWindow::setRemoteHost(int hostIdx)
continue;
// if the user previously selected 'no to all' in the save prompts below, apply that to all
// subsequent live captures
if(noToAll)
continue;
if(!live->checkAllowClose(m_LiveCaptures.count() > 1, noToAll))
return;
}
if(!PromptCloseCapture())
return;
for(LiveCapture *live : m_LiveCaptures)
{
// allow live captures to this host to stay open, that way
// we can connect to a live capture, then switch into that
// context
if(host.IsValid() && live->hostname() == host.Hostname())
continue;
// subsequent live captures by skipping the check and unconditionally cleaning all captures
if(!noToAll)
{
if(!live->checkAllowClose(unsavedCaps, noToAll))
return;
}
live->cleanItems();
live->close();
@@ -2953,22 +2950,6 @@ void MainWindow::loadLayout_triggered()
void MainWindow::closeEvent(QCloseEvent *event)
{
bool noToAll = false;
for(LiveCapture *live : m_LiveCaptures)
{
// if the user previously selected 'no to all' in the save prompts below, apply that to all
// subsequent live captures
if(noToAll)
continue;
if(!live->checkAllowClose(m_LiveCaptures.count() > 1, noToAll))
{
event->ignore();
return;
}
}
if(RENDERDOC_IsGlobalHookActive())
{
RDDialog::critical(this, tr("Global hook active"),
@@ -2983,8 +2964,27 @@ void MainWindow::closeEvent(QCloseEvent *event)
return;
}
for(LiveCapture *live : m_LiveCaptures)
bool noToAll = false;
QList<LiveCapture *> liveCaptures = m_LiveCaptures;
int unsavedCaps = 0;
for(LiveCapture *live : liveCaptures)
unsavedCaps += live->unsavedCaptureCount();
for(LiveCapture *live : liveCaptures)
{
// if the user previously selected 'no to all' in the save prompts below, apply that to all
// subsequent live captures by skipping the check and unconditionally cleaning all captures
if(!noToAll)
{
if(!live->checkAllowClose(unsavedCaps, noToAll))
{
event->ignore();
return;
}
}
live->cleanItems();
delete live;
}