summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-06-07 04:02:34 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-07 04:02:34 +0200
commit63d30436895af897f71c40669ca587b495d98649 (patch)
tree3d58f65ccb6d7123c894eaef918b1ecaa50a8f46
parentff901dc5267903b165c53139ddcff5f31bbf6964 (diff)
parent99f072c63221631ce11ab5f4d65915b5f22a9de5 (diff)
downloadUXP-63d30436895af897f71c40669ca587b495d98649.tar
UXP-63d30436895af897f71c40669ca587b495d98649.tar.gz
UXP-63d30436895af897f71c40669ca587b495d98649.tar.lz
UXP-63d30436895af897f71c40669ca587b495d98649.tar.xz
UXP-63d30436895af897f71c40669ca587b495d98649.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
-rw-r--r--widget/gtk/nsClipboard.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/widget/gtk/nsClipboard.cpp b/widget/gtk/nsClipboard.cpp
index 053ae970e..eecae3e88 100644
--- a/widget/gtk/nsClipboard.cpp
+++ b/widget/gtk/nsClipboard.cpp
@@ -214,7 +214,8 @@ nsClipboard::SetData(nsITransferable *aTransferable,
GtkTargetEntry *gtkTargets = gtk_target_table_new_from_list(list, &numTargets);
// Set getcallback and request to store data after an application exit
- if (gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
+ if (gtkTargets &&
+ gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
clipboard_get_cb, clipboard_clear_cb, this))
{
// We managed to set-up the clipboard so update internal state