Prevent access to cancelled timer

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Conversation.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -2654,8 +2654,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             }
 
             protected void updateWithResponseUiThread(final IqPacket iq) {
-                this.loadingTimer.cancel();
+                Timer oldTimer = this.loadingTimer;
                 this.loadingTimer = new Timer();
+                oldTimer.cancel();
                 this.executing = false;
                 this.loading = false;
                 this.loadingHasBeenLong = false;