summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper/wloutput.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-04-22 11:31:47 +0300
committerJørgen Lind <jorgen.lind@nokia.com>2012-04-24 13:48:41 +0200
commitb207b093c127785dba6bc9ffbd13826fe87ea5a5 (patch)
tree18c855999de5c16780bb07d624cf536d2077fed2 /src/compositor/wayland_wrapper/wloutput.cpp
parentcd20ef07ae8cdf3044555cba6f5d382ab3293d02 (diff)
Do not delete extended output instances twice
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 <jorgen.lind@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/wloutput.cpp')
-rw-r--r--src/compositor/wayland_wrapper/wloutput.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/wloutput.cpp b/src/compositor/wayland_wrapper/wloutput.cpp
index 57d073de6..c1c91edc7 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