Merge remote-tracking branch 'origin/development-stable' into development

# Conflicts: # app/src/main/java/com/jens/automation2/Trigger.java
2022-02-22 22:21:39 +01:00
parent 619f348a28 c569ab798c
commit 5af59e1754
2 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
+++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
@ -374,7 +374,7 @@ public class ActivityMainScreen extends ActivityGeneric
 				}
 				catch (Exception e)
 				{
-					activityMainScreenInstance.tvLastRule.setText("n./a.");
+					activityMainScreenInstance.tvLastProfile.setText("n./a.");
 				}
 			}
 			else