Refs #112, fixed NPE, that occurs based on Golang version.

tvrzna · Jun 11, 2024 · b6fcf7c · b6fcf7c
1 parent fa3723f
commit b6fcf7c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/session.go b/src/session.go
@@ -91,6 +91,7 @@ func (s *commonSession) start() {
 
 	if s.conf.AlwaysDbusLaunch {
 		if s.auth.usr().getenv(dbusSessionBusAddress) == "" {
+			s.dbus = &dbus{}
 			s.dbus.launch(s.auth.usr())
 		} else {
 			logPrint("DBUS_SESSION_BUS_ADDRESS is already set, skipping start of DBUS_LAUNCH")
@@ -115,7 +116,7 @@ func (s *commonSession) start() {
 
 	err := session.Wait()
 
-	if s.dbus.pid > 0 {
+	if s.dbus != nil && s.dbus.pid > 0 {
 		s.dbus.interrupt()
 	}