X-Git-Url: https://git.donarmstrong.com/?p=xournal.git;a=blobdiff_plain;f=src%2Fxo-clipboard.c;fp=src%2Fxo-clipboard.c;h=3d6cb41aaa28df66046760f65da586e23ea8538f;hp=b043c4a20ec12288a3040a3cd6bc5f3f5fc1068f;hb=9097dc4f8adafe77fee1fecb1a6353c0b16b4866;hpb=69037d6ddbe7e90d13d8a7a088d8c209a926190e

diff --git a/src/xo-clipboard.c b/src/xo-clipboard.c
index b043c4a..3d6cb41 100644
--- a/src/xo-clipboard.c
+++ b/src/xo-clipboard.c
@@ -334,7 +334,7 @@ void clipboard_paste_text(gchar *text)
   ui.cur_layer->items = g_list_append(ui.cur_layer->items, item);
   ui.cur_layer->nitems++;
   item->type = ITEM_TEXT;
-  g_memmove(&(item->brush), ui.cur_brush, sizeof(struct Brush));
+  g_memmove(&(item->brush), &(ui.brushes[ui.cur_mapping][TOOL_PEN]), sizeof(struct Brush));
   item->text = text; // text was newly allocated, we keep it
   item->font_name = g_strdup(ui.font_name);
   item->font_size = ui.font_size;
@@ -401,6 +401,10 @@ void clipboard_paste(void)
   sel_data = gtk_clipboard_wait_for_contents(
       clipboard,
       gdk_atom_intern(XOURNAL_TARGET_ATOM, FALSE));
+#ifdef WIN32 // avoid a win32 bug showing images as xournal data
+  if (gtk_selection_data_get_data_type(sel_data)!=gdk_atom_intern(XOURNAL_TARGET_ATOM, FALSE))
+    { gtk_selection_data_free(sel_data); sel_data = NULL; }
+#endif
   ui.cur_item_type = ITEM_NONE;
   if (sel_data != NULL) { 
     clipboard_paste_from_xournal(sel_data);