Commit 929c88bd authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: avoid crash in resume dialog

I don't really see how this can happen, but it should fix it.

Close #13190

(cherry picked from commit e827a9404e415145dfc348a50632fe0b3338a01c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1a5a3ba2
......@@ -435,7 +435,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();
}
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment