Merge pull request #73 from nwg-piotr/fix-72

Fix inconsistent behaviour of normal resident instance

main.go

@@ -21,7 +21,7 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
-const version = "0.3.1"
+const version = "0.3.3"
 
 var (
 	appDirs         []string
@@ -200,7 +200,10 @@ func main() {
 					log.Warnf("Resident instance already running (PID %v)", i)
 				} else {
 					log.Infof("Showing resident instance (PID %v)", i)
-					syscall.Kill(i, syscall.SIGUSR1)
+					err := syscall.Kill(i, syscall.SIGUSR1)
+					if err != nil {
+						return
+					}
 				}
 			}
 		}
@@ -546,14 +549,16 @@ func main() {
 							fileSearchResultWrapper.Hide()
 						}
 						// focus 1st element
-						b := appFlowBox.GetChildAtIndex(0)
-						if b != nil {
-							button, err := b.GetChild()
+						var button gtk.IWidget
+						if pinnedFlowBox.GetChildren().Length() > 0 {
+							button, err = pinnedFlowBox.GetChildAtIndex(0).GetChild()
+						} else {
+							button, err = appFlowBox.GetChildAtIndex(0).GetChild()
+						}
 						if err == nil {
 							button.ToWidget().GrabFocus()
 						}
 					}
-					}
 
 					return false
 				})
@@ -577,7 +582,9 @@ func main() {
 
 func restoreStateAndHide() {
 	timeStart1 := time.Now()
+	if win != nil {
 		win.Hide()
+	}
 
 	// clear search
 	searchEntry.SetText("")
@@ -590,7 +597,9 @@ func restoreStateAndHide() {
 	}
 
 	// scroll to the top
+	if resultWindow != nil {
 		resultWindow.GetVAdjustment().SetValue(0)
+	}
 
 	t := time.Now()
 	log.Debugf(fmt.Sprintf("UI hidden and restored in the backgroud in %v ms", t.Sub(timeStart1).Milliseconds()))