diff --git a/qrenderdoc/Windows/DebugMessageView.cpp b/qrenderdoc/Windows/DebugMessageView.cpp index 178e8c91d..d3e991e8d 100644 --- a/qrenderdoc/Windows/DebugMessageView.cpp +++ b/qrenderdoc/Windows/DebugMessageView.cpp @@ -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() diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index 30521ed23..c3e833d5a 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -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() diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp index e2404aaea..334e6165b 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp @@ -46,9 +46,9 @@ PipelineStateViewer::PipelineStateViewer(ICaptureContext &ctx, QWidget *parent) m_Current = NULL; - m_Ctx.AddLogViewer(this); - setToD3D11(); + + m_Ctx.AddLogViewer(this); } PipelineStateViewer::~PipelineStateViewer() diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index f2a95b215..91fcb18cf 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -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(); }