tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-12-25 Miguel de Dios <miguel.dedios@artica.es> 

Apply patch from user Santiago Munín González <burning1@gmail.com>

	* src/pandroid_event_viewer/pandorafms/Main.java: fixed the empty
	combo group because sometimes this is as null.
	
	Fixes: #3495038
	
	MERGED FROM BRANCH 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6164 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-04-25 15:59:04 +00:00
parent d0f2e121ec
commit cf006dbcc1
2 changed files with 353 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,14 @@
2011-12-25 Miguel de Dios <miguel.dedios@artica.es>
Apply patch from user Santiago Munín González <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: fixed the empty
combo group because sometimes this is as null.
Fixes: #3495038
MERGED FROM BRANCH 4.0.2
2011-10-24 Miguel de Dios <miguel.dedios@artica.es> 2011-10-24 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml: update num version. * AndroidManifest.xml: update num version.

4
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
View File

@ -325,6 +325,7 @@ public class Main extends Activity {
Spinner combo; Spinner combo;
combo = (Spinner) findViewById(R.id.group_combo); combo = (Spinner) findViewById(R.id.group_combo);
if ((combo != null) && (combo.getSelectedItem() != null)) {
String selectedGroup = combo.getSelectedItem().toString(); String selectedGroup = combo.getSelectedItem().toString();
Iterator it = pandoraGroups.entrySet().iterator(); Iterator it = pandoraGroups.entrySet().iterator();
@ -335,6 +336,7 @@ public class Main extends Activity {
filterIDGroup = e.getKey(); filterIDGroup = e.getKey();
} }
} }
}
combo = (Spinner) findViewById(R.id.severity_combo); combo = (Spinner) findViewById(R.id.severity_combo);
filterSeverity = combo.getSelectedItemPosition() - 1; filterSeverity = combo.getSelectedItemPosition() - 1;
@ -408,4 +410,4 @@ public class Main extends Activity {
timePicker.setCurrentMinute(c.get(Calendar.MINUTE)); timePicker.setCurrentMinute(c.get(Calendar.MINUTE));
*/ */
} }
} }