mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-04 09:00:44 +00:00
Only add log viewer at the end of constructors, so the window is ready
* Otherwise if OnLogFileLoaded gets called while adding the log viewer the window might be partially constructed and crash.
This commit is contained in:
@@ -225,8 +225,6 @@ DebugMessageView::DebugMessageView(ICaptureContext &ctx, QWidget *parent)
|
||||
|
||||
ui->messages->setFont(Formatter::PreferredFont());
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
|
||||
m_ContextMenu = new QMenu(this);
|
||||
|
||||
m_ShowHidden = new QAction(tr("Show hidden rows"), this);
|
||||
@@ -252,6 +250,8 @@ DebugMessageView::DebugMessageView(ICaptureContext &ctx, QWidget *parent)
|
||||
&DebugMessageView::messages_toggled);
|
||||
|
||||
RefreshMessageList();
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
}
|
||||
|
||||
DebugMessageView::~DebugMessageView()
|
||||
|
||||
@@ -65,10 +65,6 @@ EventBrowser::EventBrowser(ICaptureContext &ctx, QWidget *parent)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
OnLogfileClosed();
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
|
||||
clearBookmarks();
|
||||
|
||||
ui->jumpToEID->setFont(Formatter::PreferredFont());
|
||||
@@ -156,6 +152,10 @@ EventBrowser::EventBrowser(ICaptureContext &ctx, QWidget *parent)
|
||||
ui->events->header()->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
QObject::connect(ui->events->header(), &QHeaderView::customContextMenuRequested, this,
|
||||
&EventBrowser::events_contextMenu);
|
||||
|
||||
OnLogfileClosed();
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
}
|
||||
|
||||
EventBrowser::~EventBrowser()
|
||||
|
||||
@@ -46,9 +46,9 @@ PipelineStateViewer::PipelineStateViewer(ICaptureContext &ctx, QWidget *parent)
|
||||
|
||||
m_Current = NULL;
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
|
||||
setToD3D11();
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
}
|
||||
|
||||
PipelineStateViewer::~PipelineStateViewer()
|
||||
|
||||
@@ -490,8 +490,6 @@ TextureViewer::TextureViewer(ICaptureContext &ctx, QWidget *parent)
|
||||
ui->sliceFace->setFont(Formatter::PreferredFont());
|
||||
ui->zoomOption->setFont(Formatter::PreferredFont());
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
|
||||
Reset();
|
||||
|
||||
on_checkerBack_clicked();
|
||||
@@ -644,6 +642,8 @@ TextureViewer::TextureViewer(ICaptureContext &ctx, QWidget *parent)
|
||||
ui->zoomOption->setCurrentText(QString());
|
||||
ui->fitToWindow->toggle();
|
||||
|
||||
m_Ctx.AddLogViewer(this);
|
||||
|
||||
SetupTextureTabs();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user