summaryrefslogtreecommitdiff
path: root/Libraries/LibGUI/Application.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Libraries/LibGUI/Application.cpp')
-rw-r--r--Libraries/LibGUI/Application.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Libraries/LibGUI/Application.cpp b/Libraries/LibGUI/Application.cpp
index dd256ebdca..259f0ffe4d 100644
--- a/Libraries/LibGUI/Application.cpp
+++ b/Libraries/LibGUI/Application.cpp
@@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <AK/NeverDestroyed.h>
#include <LibCore/EventLoop.h>
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
@@ -39,17 +40,17 @@
namespace GUI {
-static WeakPtr<Application> s_the;
+static NeverDestroyed<WeakPtr<Application>> s_the;
Application* Application::the()
{
- return s_the;
+ return *s_the;
}
Application::Application(int argc, char** argv)
{
- ASSERT(!s_the);
- s_the = make_weak_ptr();
+ ASSERT(!*s_the);
+ *s_the = make_weak_ptr();
m_event_loop = make<Core::EventLoop>();
WindowServerConnection::the();
Clipboard::initialize({});