From d9f0c743ad30f7227ab5847a0d89137124dee327 Mon Sep 17 00:00:00 2001
From: gobbo_a <alexandre.gobbo@psi.ch>
Date: Fri, 12 Dec 2025 16:00:15 +0100
Subject: [PATCH] Fix ScrenPanel first repainting if server blocks.

---
 screenpanel-sf/src/main/java/ScreenPanelSF.java   | 4 ++--
 screenpanel-sls/src/main/java/ScreenPanelSLS.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/screenpanel-sf/src/main/java/ScreenPanelSF.java b/screenpanel-sf/src/main/java/ScreenPanelSF.java
index 9ef1993..7be594c 100755
--- a/screenpanel-sf/src/main/java/ScreenPanelSF.java
+++ b/screenpanel-sf/src/main/java/ScreenPanelSF.java
@@ -7,7 +7,6 @@ import ch.psi.pshell.epics.ChannelInteger;
 import ch.psi.pshell.epics.Epics;
 import ch.psi.pshell.imaging.Overlay;
 import ch.psi.pshell.imaging.Overlays;
-import ch.psi.pshell.imaging.Source;
 import ch.psi.pshell.workbench.App;
 import ch.psi.pshell.framework.Context;
 import ch.psi.pshell.framework.Panel;
@@ -72,7 +71,8 @@ public class ScreenPanelSF extends Panel implements CamServerViewer.CamServerVie
 
     @Override
     public void onStart() {
-        super.onStart();        
+        super.onStart();   
+        repaint(); //Even if invoked, amServerViewer.initialize can block first painting if server is not reachable.
         try {                    
             SwingUtilities.invokeLater(()->{
                 try {            
diff --git a/screenpanel-sls/src/main/java/ScreenPanelSLS.java b/screenpanel-sls/src/main/java/ScreenPanelSLS.java
index 2608f53..99110ef 100755
--- a/screenpanel-sls/src/main/java/ScreenPanelSLS.java
+++ b/screenpanel-sls/src/main/java/ScreenPanelSLS.java
@@ -100,8 +100,9 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi
     }
 
     @Override
-    public void onStart() {
+    public void onStart() {        
         super.onStart(); 
+        repaint(); //Even if invoked, ServerViewer.initialize can block first painting if server is not reachable.
         try {            
             SwingUtilities.invokeLater(()->{
                 try {