Commit 6dbcf7e6 authored by Sarah Grebing's avatar Sarah Grebing

Merge remote-tracking branch 'remotes/origin/master' into luongSavepointTemp

# Conflicts:
#	ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
parent 439ada64
......@@ -44,8 +44,12 @@ public class SavePointController {
main.cboSavePoints.setConverter(new StringConverter<SavePoint>() {
@Override
public String toString(SavePoint object) {
return String.format("%s (in line %d)",
object.getName(), object.getLineNumer());
if(object != null) {
return String.format("%s (in line %d)",
object.getName(), object.getLineNumer());
} else {
return "";
}
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment