Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/e33fc007c78b29075d0fae5973e68ac1ddb47f65?style=split&whitespace=show-all You should set ROOT_URL correctly, otherwise the web may not work correctly.

prevent a crash when clearBackground then undo then redo then clearBackground

preferencesAboutTextFull
Clément Fauconnier 4 years ago
parent 7e83f910ca
commit e33fc007c7
  1. 6
      src/domain/UBGraphicsItemUndoCommand.cpp
  2. 1
      src/domain/UBGraphicsScene.cpp

@ -246,7 +246,11 @@ void UBGraphicsItemUndoCommand::redo()
polygonItem->strokesGroup()->removeFromGroup(polygonItem); polygonItem->strokesGroup()->removeFromGroup(polygonItem);
} }
mScene->removeItem(item);
if (itemLayerType::BackgroundItem == item->data(UBGraphicsItemData::itemLayerType))
mScene->setAsBackgroundObject(nullptr);
else
mScene->removeItem(item);
if (bApplyTransform) if (bApplyTransform)
item->setTransform(t); item->setTransform(t);

@ -1476,6 +1476,7 @@ void UBGraphicsScene::clearContent(clearCase pCase)
if(mBackgroundObject){ if(mBackgroundObject){
removeItem(mBackgroundObject); removeItem(mBackgroundObject);
removedItems << mBackgroundObject; removedItems << mBackgroundObject;
mBackgroundObject = nullptr;
} }
break; break;

Loading…
Cancel
Save