Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
a2731364
Commit
a2731364
authored
Jan 19, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Try to improve quitting of the application... Ref #1397
parent
c47b2e44
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
11 deletions
+22
-11
modules/gui/qt4/dialogs/open.hpp
modules/gui/qt4/dialogs/open.hpp
+5
-0
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+1
-1
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+4
-5
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-3
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+11
-2
No files found.
modules/gui/qt4/dialogs/open.hpp
View file @
a2731364
...
...
@@ -42,6 +42,11 @@ public:
static
OpenDialog
*
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
int
_action_flag
=
0
,
bool
modal
=
false
);
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
instance
=
NULL
;
}
virtual
~
OpenDialog
();
void
showTab
(
int
);
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
a2731364
...
...
@@ -112,7 +112,7 @@ public:
static
void
killInstance
()
{
if
(
instance
)
delete
instance
;
instance
=
NULL
;
instance
=
NULL
;
}
virtual
~
DialogsProvider
();
QTimer
*
fixed_timer
;
...
...
modules/gui/qt4/input_manager.cpp
View file @
a2731364
...
...
@@ -213,7 +213,6 @@ void InputManager::customEvent( QEvent *event )
delInput
();
return
;
}
IMEvent
*
ime
=
static_cast
<
IMEvent
*>
(
event
);
...
...
@@ -288,7 +287,7 @@ void InputManager::UpdateRate( void )
i_rate
=
i_new_rate
;
/* Update rate */
emit
rateChanged
(
i_rate
);
}
}
}
void
InputManager
::
UpdateMeta
(
void
)
...
...
@@ -479,8 +478,8 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL),
MainInputManager
::~
MainInputManager
()
{
if
(
p_input
)
{
if
(
p_input
)
{
vlc_object_release
(
p_input
);
emit
inputChanged
(
NULL
);
}
...
...
@@ -500,7 +499,7 @@ void MainInputManager::customEvent( QEvent *event )
emit
volumeChanged
();
return
;
}
if
(
VLC_OBJECT_INTF
==
p_intf
->
i_object_type
)
{
vlc_mutex_lock
(
&
p_intf
->
change_lock
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
a2731364
...
...
@@ -1132,9 +1132,7 @@ void MainInterface::wheelEvent( QWheelEvent *e )
void
MainInterface
::
closeEvent
(
QCloseEvent
*
e
)
{
hide
();
vlc_object_kill
(
p_intf
);
QApplication
::
closeAllWindows
();
QApplication
::
quit
();
THEDP
->
quit
();
}
/*****************************************************************************
...
...
modules/gui/qt4/qt4.cpp
View file @
a2731364
...
...
@@ -289,7 +289,6 @@ static void Init( intf_thread_t *p_intf )
p_mi
->
show
();
}
else
/*if( p_intf->pf_show_dialog )*/
vlc_thread_ready
(
p_intf
);
#ifdef ENABLE_NLS
...
...
@@ -327,8 +326,18 @@ static void Init( intf_thread_t *p_intf )
app
->
exec
();
/* And quit */
MainInputManager
::
killInstance
();
/* Destroy first the main interface because it is connected to some slots
in the MainInputManager */
if
(
p_intf
->
p_sys
->
p_mi
)
delete
p_intf
->
p_sys
->
p_mi
;
/* Destroy then other windows, because some are connected to some slots
in the MainInputManager */
DialogsProvider
::
killInstance
();
/* Destroy the MainInputManager */
MainInputManager
::
killInstance
();
delete
app
;
}
...
...
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