GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 20:55:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash on application exit (SPE-2212, was never public)

Browse Source
This commit is contained in:
Jan Bařtipán 2024-04-05 14:02:04 +02:00 committed by Lukas Matena
parent f12e0b4d21
commit 95d1d6fa14
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/UserAccountSession.cpp
View File

@ -30,7 +30,7 @@ wxDEFINE_EVENT(EVT_UA_RESET, UserAccountFailEvent);
wxDEFINE_EVENT(EVT_UA_FAIL, UserAccountFailEvent); wxDEFINE_EVENT(EVT_UA_FAIL, UserAccountFailEvent);
#endif // 0 #endif // 0
void UserActionPost::perform(/*UNUSED*/ wxEvtHandler* evt_handler, /*UNUSED*/ const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) void UserActionPost::perform(/*UNUSED*/ wxEvtHandler* evt_handler, /*UNUSED*/ const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const
{ {
std::string url = m_url; std::string url = m_url;
auto http = Http::post(std::move(url)); auto http = Http::post(std::move(url));
@ -48,7 +48,7 @@ void UserActionPost::perform(/*UNUSED*/ wxEvtHandler* evt_handler, /*UNUSED*/ co
http.perform_sync(); http.perform_sync();
} }
void UserActionGetWithEvent::perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) void UserActionGetWithEvent::perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const
{ {
std::string url = m_url + input; std::string url = m_url + input;
auto http = Http::get(std::move(url)); auto http = Http::get(std::move(url));

11
src/slic3r/GUI/UserAccountSession.hpp
View File

@ -53,8 +53,9 @@ class UserAction
{ {
public: public:
UserAction(const std::string name, const std::string url) : m_action_name(name), m_url(url){} UserAction(const std::string name, const std::string url) : m_action_name(name), m_url(url){}
~UserAction() {} virtual ~UserAction() = default;
virtual void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) = 0; virtual void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const = 0;
protected: protected:
std::string m_action_name; std::string m_action_name;
std::string m_url; std::string m_url;
@ -69,7 +70,7 @@ public:
, UserAction(name, url) , UserAction(name, url)
{} {}
~UserActionGetWithEvent() {} ~UserActionGetWithEvent() {}
void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) override; void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const override;
private: private:
wxEventType m_succ_evt_type; wxEventType m_succ_evt_type;
wxEventType m_fail_evt_type; wxEventType m_fail_evt_type;
@ -80,7 +81,7 @@ class UserActionPost : public UserAction
public: public:
UserActionPost(const std::string name, const std::string url) : UserAction(name, url) {} UserActionPost(const std::string name, const std::string url) : UserAction(name, url) {}
~UserActionPost() {} ~UserActionPost() {}
void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) override; void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const override;
}; };
class DummyUserAction : public UserAction class DummyUserAction : public UserAction
@ -88,7 +89,7 @@ class DummyUserAction : public UserAction
public: public:
DummyUserAction() : UserAction("Dummy", {}) {} DummyUserAction() : UserAction("Dummy", {}) {}
~DummyUserAction() {} ~DummyUserAction() {}
void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) override { } void perform(wxEvtHandler* evt_handler, const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const override { }
}; };
struct ActionQueueData struct ActionQueueData