Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer

This commit is contained in:
AdrianLxM 2017-08-17 21:29:15 +02:00
commit 5769915f8c

View file

@ -88,7 +88,7 @@ public class ProfileViewerDialog extends DialogFragment {
private void setContent() {
Profile profile = null;
ProfileSwitch profileSwitch = MainApp.getConfigBuilder().getProfileSwitchFromHistory(time);
if(profileSwitch!=null){
if(profileSwitch!=null && profileSwitch.profileJson != null){
profile = profileSwitch.getProfileObject();
}
if (profile != null) {
@ -105,9 +105,4 @@ public class ProfileViewerDialog extends DialogFragment {
noProfile.setVisibility(View.VISIBLE);
}
}
}