From 56fbd900220e1a866b6607e0ccda0a7701542fa2 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Wed, 24 Feb 2016 02:27:37 +0300
Subject: [PATCH] Fix reminder display

---
 .../main/java/ru/vfilippov/electronreminder/MainActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ru/vfilippov/electronreminder/MainActivity.java b/app/src/main/java/ru/vfilippov/electronreminder/MainActivity.java
index da212d4..ae83ff6 100644
--- a/app/src/main/java/ru/vfilippov/electronreminder/MainActivity.java
+++ b/app/src/main/java/ru/vfilippov/electronreminder/MainActivity.java
@@ -128,7 +128,6 @@ public class MainActivity extends AppCompatActivity
     private void loadRemindersFile()
     {
         SimpleXmlNode n = SimpleXml.readXmlFile(getFilesDir(), "reminders.xml");
-        reminders = null;
         if (n != null)
         {
             reminders.clear();
@@ -143,7 +142,7 @@ public class MainActivity extends AppCompatActivity
     private boolean loadTripsFile()
     {
         SimpleXmlNode xmltrips = SimpleXml.readXmlFile(getFilesDir(), "trips_"+curFrom+"_"+curTo+".xml");
-        if (xmltrips != null)
+        if (xmltrips != null && xmltrips.childrenByName.get("segment") != null)
         {
             trips.clear();
             for (SimpleXmlNode s: xmltrips.childrenByName.get("segment"))
@@ -323,6 +322,7 @@ public class MainActivity extends AppCompatActivity
             }
         });
 
+        loadRemindersFile();
         loadStations();
     }