Fix T69122: Area Join Error on Invalid Cursor Position

Improved error handling of Join Area operator in cased it is passed cursor position that is not valid.

Differential Revision: https://developer.blender.org/D5598

Reviewed by Brecht Van Lommel

5 files changed, 3 insertions, 1 deletions

diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 5557cda2a6dc34fc2e18d89fde8e5aa50e374e3
+Subproject 61cb42387d1356c168d0e89acaef44a5e365520
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 4a66c4e0b80f5483c8434554c615a56fef71d62
+Subproject 6361074c40587f114285542897ffc830902088d
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 80e2be8ff8e23dad3487d4ceef82ce7067cee41
+Subproject 8b5ea4d118e56111999832dcbc8302048341423
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 417bdf84232..0ab21990086 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3363,7 +3363,9 @@ static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
   sAreaJoinData *jd;
 
   if (op->customdata == NULL) {
-    area_join_init(C, op, NULL, NULL);
+    if (!area_join_init(C, op, NULL, NULL)) {
+      return OPERATOR_CANCELLED;
+    }
   }
   jd = (sAreaJoinData *)op->customdata;
 
diff --git a/source/tools b/source/tools
-Subproject cc8fcc2294682c7608665e6e0180f0449aad230
+Subproject 2550eda6bcefad45289acbb4b8e52107e742ce1