Commit c880ad17 authored by Jochen Becher's avatar Jochen Becher
Browse files

ModelEditor: Merge two if statements into one



Change-Id: I3535537a7a8e0f1ab1a618b3f255840340b1a182
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 8ec154a7
......@@ -58,9 +58,7 @@ void UndoCommand::setDoNotMerge(bool doNotMerge)
bool UndoCommand::mergeWith(const QUndoCommand *other)
{
auto otherCommand = dynamic_cast<const UndoCommand *>(other);
if (!otherCommand)
return false;
if (otherCommand->m_doNotMerge)
if (!otherCommand || otherCommand->m_doNotMerge)
return false;
return mergeWith(otherCommand);
}
......
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