summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2011-08-24 18:35:27 +0000
committerNanang Izzuddin <nanang@teluu.com>2011-08-24 18:35:27 +0000
commit8a9b27d26dcdb1fb32a134818e9eed25724f6267 (patch)
treeff7d1212e669a5ce845efbe4d830f8e650e30043
parent74b63dd741b07f1a67cc75303a36db44c35c47a8 (diff)
Re #1327 (vidgui): Fix stuck/hang when quiting vidgui without stopping video preview. Somehow the SDL will stuck (wait forever) in destroying its render window when the render window parent (VidWin) hasn't been destroyed.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3721 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjsip-apps/src/vidgui/vidgui.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/pjsip-apps/src/vidgui/vidgui.cpp b/pjsip-apps/src/vidgui/vidgui.cpp
index dfc809cd..93c76b85 100644
--- a/pjsip-apps/src/vidgui/vidgui.cpp
+++ b/pjsip-apps/src/vidgui/vidgui.cpp
@@ -104,8 +104,14 @@ void MainWin::initLayout()
void MainWin::quit()
{
- if (preview_on)
- preview();
+ //if (preview_on)
+ //preview();
+
+ delete video_prev_;
+ video_prev_ = NULL;
+ delete video_;
+ video_ = NULL;
+
pjsua_destroy();
qApp->quit();
}