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
e827a940
Commit
e827a940
authored
Dec 14, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: avoid crash in resume dialog
I don't really see how this can happen, but it should fix it. Close #13190
parent
4588b01c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+3
-1
modules/video_output/msw/directx.c
modules/video_output/msw/directx.c
+2
-2
No files found.
modules/gui/qt4/main_interface.cpp
View file @
e827a940
...
...
@@ -433,7 +433,9 @@ void MainInterface::hideResumePanel()
void
MainInterface
::
resumePlayback
()
{
var_SetTime
(
THEMIM
->
getInput
(),
"time"
,
i_resumeTime
);
if
(
THEMIM
->
getIM
()
->
hasInput
()
)
{
var_SetTime
(
THEMIM
->
getInput
(),
"time"
,
i_resumeTime
);
}
hideResumePanel
();
}
...
...
modules/video_output/msw/directx.c
View file @
e827a940
...
...
@@ -851,8 +851,8 @@ static int DirectXCreateSurface(vout_display_t *vd,
ddsd
.
dwSize
=
sizeof
(
ddsd
);
ddsd
.
ddpfPixelFormat
.
dwSize
=
sizeof
(
ddsd
.
ddpfPixelFormat
);
ddsd
.
dwFlags
=
DDSD_HEIGHT
|
DDSD_WIDTH
;
ddsd
.
dwWidth
=
fmt
->
i_
visible_
width
;
ddsd
.
dwHeight
=
fmt
->
i_
visible_
height
;
ddsd
.
dwWidth
=
fmt
->
i_width
;
ddsd
.
dwHeight
=
fmt
->
i_height
;
if
(
fourcc
)
{
ddsd
.
dwFlags
|=
DDSD_PIXELFORMAT
;
ddsd
.
ddpfPixelFormat
.
dwFlags
=
DDPF_FOURCC
;
...
...
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