From 4330a090d8e05b91e7be80dbefda52e8c07e163e Mon Sep 17 00:00:00 2001
From: Carl-Robert Linnupuu <carlrobertoh@gmail.com>
Date: Fri, 4 Jul 2025 12:59:46 +0100
Subject: [PATCH] fix: prevent NPE when loading state with null conversations

---
 .../carlrobert/codegpt/conversations/ConversationsState.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/ee/carlrobert/codegpt/conversations/ConversationsState.java b/src/main/java/ee/carlrobert/codegpt/conversations/ConversationsState.java
index e1261e35..50d545f4 100644
--- a/src/main/java/ee/carlrobert/codegpt/conversations/ConversationsState.java
+++ b/src/main/java/ee/carlrobert/codegpt/conversations/ConversationsState.java
@@ -47,6 +47,10 @@ public class ConversationsState implements PersistentStateComponent<Conversation
   public void loadState(@NotNull ConversationsState state) {
     XmlSerializerUtil.copyBean(state, this);
 
+    if (this.conversations == null) {
+      this.conversations = new ArrayList<>();
+    }
+
     conversationsContainer.getConversationsMapping().values().stream()
         .flatMap(Collection::stream)
         .sorted(Comparator.comparing(Conversation::getUpdatedOn).reversed())