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
721758e7
Commit
721758e7
authored
Aug 12, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better solution to fix some skins2 crash on exit.
parent
a1d12e8c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+4
-0
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+3
-3
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+0
-1
No files found.
modules/gui/qt4/dialogs_provider.hpp
View file @
721758e7
...
@@ -104,6 +104,10 @@ public:
...
@@ -104,6 +104,10 @@ public:
if
(
instance
)
delete
instance
;
if
(
instance
)
delete
instance
;
instance
=
NULL
;
instance
=
NULL
;
}
}
static
bool
isAlive
()
{
return
(
instance
!=
NULL
);
}
virtual
~
DialogsProvider
();
virtual
~
DialogsProvider
();
QTimer
*
fixed_timer
;
QTimer
*
fixed_timer
;
...
...
modules/gui/qt4/qt4.cpp
View file @
721758e7
...
@@ -272,8 +272,9 @@ static void Close( vlc_object_t *p_this )
...
@@ -272,8 +272,9 @@ static void Close( vlc_object_t *p_this )
if
(
p_intf
->
p_sys
->
b_isDialogProvider
)
if
(
p_intf
->
p_sys
->
b_isDialogProvider
)
{
{
if
(
p_intf
->
p_sys
->
p_dp
)
if
(
DialogsProvider
::
isAlive
()
)
{
{
msg_Dbg
(
p_intf
,
"Asking the DP to quit nicely"
);
DialogEvent
*
event
=
new
DialogEvent
(
INTF_DIALOG_EXIT
,
0
,
NULL
);
DialogEvent
*
event
=
new
DialogEvent
(
INTF_DIALOG_EXIT
,
0
,
NULL
);
QApplication
::
postEvent
(
THEDP
,
static_cast
<
QEvent
*>
(
event
)
);
QApplication
::
postEvent
(
THEDP
,
static_cast
<
QEvent
*>
(
event
)
);
}
}
...
@@ -344,7 +345,7 @@ static void *Init( vlc_object_t *obj )
...
@@ -344,7 +345,7 @@ static void *Init( vlc_object_t *obj )
app
->
setWindowIcon
(
QIcon
(
QPixmap
(
vlc_xpm
)
)
);
app
->
setWindowIcon
(
QIcon
(
QPixmap
(
vlc_xpm
)
)
);
/* Initialize timers and the Dialog Provider */
/* Initialize timers and the Dialog Provider */
p_intf
->
p_sys
->
p_dp
=
DialogsProvider
::
getInstance
(
p_intf
);
DialogsProvider
::
getInstance
(
p_intf
);
QPointer
<
MainInterface
>
*
miP
=
NULL
;
QPointer
<
MainInterface
>
*
miP
=
NULL
;
...
@@ -451,7 +452,6 @@ static void *Init( vlc_object_t *obj )
...
@@ -451,7 +452,6 @@ static void *Init( vlc_object_t *obj )
Settings must be destroyed after that.
Settings must be destroyed after that.
*/
*/
DialogsProvider
::
killInstance
();
DialogsProvider
::
killInstance
();
p_intf
->
p_sys
->
p_dp
=
NULL
;
/* Delete the configuration. Application has to be deleted after that. */
/* Delete the configuration. Application has to be deleted after that. */
delete
p_intf
->
p_sys
->
mainSettings
;
delete
p_intf
->
p_sys
->
mainSettings
;
...
...
modules/gui/qt4/qt4.hpp
View file @
721758e7
...
@@ -52,7 +52,6 @@ struct intf_sys_t
...
@@ -52,7 +52,6 @@ struct intf_sys_t
{
{
QApplication
*
p_app
;
QApplication
*
p_app
;
MainInterface
*
p_mi
;
MainInterface
*
p_mi
;
DialogsProvider
*
p_dp
;
QSettings
*
mainSettings
;
QSettings
*
mainSettings
;
...
...
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