diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2022-09-19 21:08:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-19 21:08:48 +0100 |
| commit | a8943246a79faff415f2da7e210e80ae51b00d95 (patch) | |
| tree | 72cd02d0637058fc277bcdf1ea1073bff3a8fd37 /src | |
| parent | e42de0b77807ab27666e82ec6f78bc286b9d0754 (diff) | |
| parent | 51461655990da1c6b5c932e235bf664f4797b7cf (diff) | |
Merge pull request #684 from tomahk/main
fix some bugs with attaching/disabling monitors
Diffstat (limited to 'src')
| -rw-r--r-- | src/events/Monitors.cpp | 3 | ||||
| -rw-r--r-- | src/helpers/Monitor.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index 211562b0..6484f4d1 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -286,7 +286,8 @@ void Events::listener_monitorFrame(void* owner, void* data) { pixman_region32_fini(&frameDamage); pixman_region32_fini(&damage); - wlr_output_commit(PMONITOR->output); + if (!wlr_output_commit(PMONITOR->output)) + return; if (*PDAMAGEBLINK || *PNOVFR) g_pCompositor->scheduleFrameForMonitor(PMONITOR); diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp index 509f292d..ab04bcbe 100644 --- a/src/helpers/Monitor.cpp +++ b/src/helpers/Monitor.cpp @@ -65,6 +65,8 @@ void CMonitor::onConnect(bool noRule) { } if (!m_bRenderingInitPassed) { + output->allocator = nullptr; + output->renderer = nullptr; wlr_output_init_render(output, g_pCompositor->m_sWLRAllocator, g_pCompositor->m_sWLRRenderer); m_bRenderingInitPassed = true; } @@ -356,4 +358,4 @@ void CMonitor::setMirror(const std::string& mirrorOf) { g_pCompositor->m_pLastMonitor = g_pCompositor->m_vMonitors.front().get(); } -}
\ No newline at end of file +} |