From b207b093c127785dba6bc9ffbd13826fe87ea5a5 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Sun, 22 Apr 2012 11:31:47 +0300 Subject: [PATCH] Do not delete extended output instances twice MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No need to destroy in Output dtor, delete is already called in ExtendedOutput::destroy_resource. This prevents crashing when exiting the compositor. Change-Id: I2558ee012be56da055dbefbb474c0124681321ba Reviewed-by: Jørgen Lind --- src/compositor/wayland_wrapper/wloutput.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compositor/wayland_wrapper/wloutput.cpp b/src/compositor/wayland_wrapper/wloutput.cpp index 57d073d..c1c91ed 100644 --- a/src/compositor/wayland_wrapper/wloutput.cpp +++ b/src/compositor/wayland_wrapper/wloutput.cpp @@ -98,7 +98,6 @@ Output::Output(OutputGlobal *outputGlobal, wl_client *client, uint32_t version, Output::~Output() { - delete m_extended_output; } ExtendedOutput *Output::extendedOutput() const -- 2.7.4