Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
e12ddbf2
Commit
e12ddbf2
authored
Sep 16, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Qt crash on exit
parent
ace4087e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
2 deletions
+10
-2
modules/gui/qt4/dialogs/playlist.hpp
modules/gui/qt4/dialogs/playlist.hpp
+1
-0
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+5
-0
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+2
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+2
-0
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+0
-1
No files found.
modules/gui/qt4/dialogs/playlist.hpp
View file @
e12ddbf2
...
@@ -39,6 +39,7 @@ public:
...
@@ -39,6 +39,7 @@ public:
if
(
!
instance
)
instance
=
new
PlaylistDialog
(
p_intf
);
if
(
!
instance
)
instance
=
new
PlaylistDialog
(
p_intf
);
return
instance
;
return
instance
;
}
}
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
}
virtual
~
PlaylistDialog
();
virtual
~
PlaylistDialog
();
private:
private:
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
e12ddbf2
...
@@ -52,6 +52,11 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
...
@@ -52,6 +52,11 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
this
,
menuUpdateAction
(
QObject
*
)
);
this
,
menuUpdateAction
(
QObject
*
)
);
}
}
DialogsProvider
::~
DialogsProvider
()
{
PlaylistDialog
::
killInstance
();
}
void
DialogsProvider
::
customEvent
(
QEvent
*
event
)
void
DialogsProvider
::
customEvent
(
QEvent
*
event
)
{
{
if
(
event
->
type
()
==
DialogEvent_Type
)
if
(
event
->
type
()
==
DialogEvent_Type
)
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
e12ddbf2
...
@@ -52,7 +52,8 @@ public:
...
@@ -52,7 +52,8 @@ public:
instance
=
new
DialogsProvider
(
p_intf
);
instance
=
new
DialogsProvider
(
p_intf
);
return
instance
;
return
instance
;
}
}
virtual
~
DialogsProvider
()
{};
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
}
virtual
~
DialogsProvider
();
QTimer
*
fixed_timer
;
QTimer
*
fixed_timer
;
protected:
protected:
friend
class
QVLCMenu
;
friend
class
QVLCMenu
;
...
...
modules/gui/qt4/main_interface.cpp
View file @
e12ddbf2
...
@@ -276,6 +276,8 @@ void MainInterface::updateOnTimer()
...
@@ -276,6 +276,8 @@ void MainInterface::updateOnTimer()
{
{
if
(
p_intf
->
b_die
)
if
(
p_intf
->
b_die
)
{
{
QApplication
::
closeAllWindows
();
DialogsProvider
::
killInstance
();
QApplication
::
quit
();
QApplication
::
quit
();
}
}
audio_volume_t
i_volume
;
audio_volume_t
i_volume
;
...
...
modules/gui/qt4/qt4.cpp
View file @
e12ddbf2
...
@@ -145,7 +145,6 @@ static void Init( intf_thread_t *p_intf )
...
@@ -145,7 +145,6 @@ static void Init( intf_thread_t *p_intf )
app
->
setQuitOnLastWindowClosed
(
false
);
app
->
setQuitOnLastWindowClosed
(
false
);
app
->
exec
();
app
->
exec
();
// fprintf( stderr, "Qt execution terminated\n" );
MainInputManager
::
killInstance
();
MainInputManager
::
killInstance
();
delete
p_intf
->
p_sys
->
p_mi
;
delete
p_intf
->
p_sys
->
p_mi
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment