Add display to Firestarter nest prevention info
Should allow for xephyr compat now
This commit is contained in:
		@@ -154,8 +154,9 @@ step_preexecute() {
 | 
				
			|||||||
	[ -n "$_optdryrun" ] && return 0
 | 
						[ -n "$_optdryrun" ] && return 0
 | 
				
			||||||
	#[ -r "$HOME/.xsessionrc" ] && . "$HOME/.xsessionrc"
 | 
						#[ -r "$HOME/.xsessionrc" ] && . "$HOME/.xsessionrc"
 | 
				
			||||||
	export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-firestarter}"
 | 
						export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-firestarter}"
 | 
				
			||||||
	[ -n "$FIRESTARTER" ] && error "Firestarter is already running: $FIRESTARTER" 55
 | 
						[ -n "$FIRESTARTER" ] && [ "$FIRESTARTER_DISPLAY" == "$DISPLAY" ] error "Firestarter is already running on $DISPLAY: $FIRESTARTER" 55
 | 
				
			||||||
	export FIRESTARTER="$BASHPID"
 | 
						export FIRESTARTER="$BASHPID"
 | 
				
			||||||
 | 
						export FIRESTARTER_DISPLAY="$DISPLAY"
 | 
				
			||||||
	# dbus
 | 
						# dbus
 | 
				
			||||||
	if \
 | 
						if \
 | 
				
			||||||
		[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && \
 | 
							[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && \
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user