Fix #21641: crash when disabling active addon, removing operator

type could still leave it in the history stack.

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 2420310c774a627cc48bd39b39d740a22078fb70..b8d8a5ab790fb09fb65086cbe6314214974c3f83 100644 (file)
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -612,6 +612,12 @@ static void rna_Operator_unregister(const bContext *C, StructRNA *type)
        if(!ot)
                return;
 
        if(!ot)
                return;
 

+       /* update while blender is running */
+       if(C) {
+               WM_operator_stack_clear((bContext*)C);
+               WM_main_add_notifier(NC_SCREEN|NA_EDITED, NULL);
+       }
+

        RNA_struct_free_extension(type, &ot->ext);
 
        idname= ot->idname;
        RNA_struct_free_extension(type, &ot->ext);
 
        idname= ot->idname;


@@ -620,10 +626,6 @@ static void rna_Operator_unregister(const bContext *C, StructRNA *type)
 
        /* not to be confused with the RNA_struct_free that WM_operatortype_remove calls, they are 2 different srna's */
        RNA_struct_free(&BLENDER_RNA, type);
 
        /* not to be confused with the RNA_struct_free that WM_operatortype_remove calls, they are 2 different srna's */
        RNA_struct_free(&BLENDER_RNA, type);

-
-       /* update while blender is running */
-       if(C)
-               WM_main_add_notifier(NC_SCREEN|NA_EDITED, NULL);

 }
 
 static int operator_poll(bContext *C, wmOperatorType *ot)
 }
 
 static int operator_poll(bContext *C, wmOperatorType *ot)