Merge branch 'aleksei_kanash_dev' into develop

src/core/UBApplicationController.cpp

@@ -595,7 +595,7 @@ void UBApplicationController::checkUpdateRequest()
 
 void UBApplicationController::hideDesktop()
 {
-    mDisplayManager->adjustScreens(-1);
+   
 
     if(UBStylusTool::Eraser != UBDrawingController::drawingController()->stylusTool()){
     	UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector);
@@ -623,6 +623,9 @@ void UBApplicationController::hideDesktop()
     }
 
     mIsShowingDesktop = false;
+
+    mDisplayManager->adjustScreens(-1);
+
     emit desktopMode(false);
 }
 

src/domain/UBGraphicsScene.cpp

@@ -477,6 +477,7 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres
 
             if (currentTool == UBStylusTool::Line || dc->mActiveRuler)
             {
+                if (UBDrawingController::drawingController()->stylusTool() != UBStylusTool::Marker)
                 if(NULL != mpLastPolygon && NULL != mCurrentStroke && mAddedItems.size() > 0){
                     UBCoreGraphicsScene::removeItemFromDeletion(mpLastPolygon);
                     mAddedItems.remove(mpLastPolygon);
@@ -742,6 +743,9 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth,
     // Here we add the item to the scene
     addItem(polygonItem);
 
+    if (!mCurrentStroke)
+        mCurrentStroke = new UBGraphicsStroke();
+
     if (mCurrentStroke)
     {
         polygonItem->setStroke(mCurrentStroke);