From f638499bfb82cea9068209dca81c4200a80fc88f Mon Sep 17 00:00:00 2001
From: Luca Errani <luca.errani1@gmail.com>
Date: Thu, 13 Dec 2018 20:25:53 +0100
Subject: [PATCH] Added icon for highlighter and fixed method in Export dialog

---
 src/gui/Cursor.cpp              | 11 +++++++++--
 src/gui/dialog/ExportDialog.cpp |  4 ----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/gui/Cursor.cpp b/src/gui/Cursor.cpp
index d3f068b8..f98073bd 100644
--- a/src/gui/Cursor.cpp
+++ b/src/gui/Cursor.cpp
@@ -339,9 +339,16 @@ GdkCursor* Cursor::createHighlighterOrPenCursor(int size, double alpha)
 	cairo_surface_t* crCursor = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
 	cairo_t* cr = cairo_create(crCursor);
 
-	if (big && size != 5) //size == 5 for highlighter
+	if (big)
 	{
-		cairo_set_source_rgb(cr, 1, 1, 1);
+		if(size == 5)
+		{
+			cairo_set_source_rgb(cr, r, g, b);
+		}
+		else
+		{
+			cairo_set_source_rgb(cr, 1, 1, 1);
+		}
 		cairo_set_line_width(cr, 1.2);
 		
 		// Plain cursor drawing + color dot
diff --git a/src/gui/dialog/ExportDialog.cpp b/src/gui/dialog/ExportDialog.cpp
index 648d8f03..b0460118 100644
--- a/src/gui/dialog/ExportDialog.cpp
+++ b/src/gui/dialog/ExportDialog.cpp
@@ -104,10 +104,6 @@ void ExportDialog::show(GtkWindow* parent)
 	{
 		confirmed = true;
 	}
-	else
-	{
-		return;
-	}
 
 	gtk_widget_hide(this->window);
 }