Merge branch 'master' into Develop

# Conflicts: # cps/admin.py # cps/converter.py # cps/subproc_wrapper.py # test/Calibre-Web TestSummary_Linux.html
2021-07-30 16:33:06 +02:00
parent a1a8a0cf29 a63baa1758
commit 302679719d
38 changed files with 701 additions and 493 deletions
@@ -609,7 +609,10 @@ $(function() {
                            if (xhr.status < 400) {
                                $("#spinning_success").hide();
                                clearInterval(rebootInterval);
-                                handle_response(data.result);
+                                if (data.result) {
+                                    handle_response(data.result);
+                                    data.result = "";
+                                }
                            }
                        },
                    });