Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
1d5847a4
Commit
1d5847a4
authored
Feb 04, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix Wayland crash on layout switch.
CCBUGS: 448178
parent
b4911b0d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/layoutmanagement.cpp
View file @
1d5847a4
...
...
@@ -214,7 +214,7 @@ bool LayoutManagement::loadLayout(const QString &layoutId, bool selectButton)
state
.
remove
(
0
,
5
);
}
pCore
->
window
()
->
centralWidget
()
->
setHidden
(
!
timelineVisible
);
pCore
->
window
()
->
r
estoreState
(
state
);
pCore
->
window
()
->
processR
estoreState
(
state
);
pCore
->
window
()
->
tabifyBins
();
if
(
selectButton
)
{
// Activate layout button
...
...
src/mainwindow.cpp
View file @
1d5847a4
...
...
@@ -4648,6 +4648,14 @@ int MainWindow::binCount() const
return
m_binWidgets
.
count
();
}
void
MainWindow
::
processRestoreState
(
const
QByteArray
&
state
)
{
// On Wayland, restoreState crashes when quickly hiding/showing/hiding a monitor in restoreState, so hide before restoring
m_projectMonitorDock
->
close
();
m_clipMonitorDock
->
close
();
restoreState
(
state
);
}
#ifdef DEBUG_MAINW
#undef DEBUG_MAINW
#endif
src/mainwindow.h
View file @
1d5847a4
...
...
@@ -93,6 +93,8 @@ public:
QAction
*
addAction
(
const
QString
&
name
,
const
QString
&
text
,
const
QObject
*
receiver
,
const
char
*
member
,
const
QIcon
&
icon
=
QIcon
(),
const
QKeySequence
&
shortcut
=
QKeySequence
(),
KActionCategory
*
category
=
nullptr
);
void
processRestoreState
(
const
QByteArray
&
state
);
/**
* @brief Adds a new dock widget to this window.
* @param title title of the dock widget
...
...
Write
Preview
Supports
Markdown
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