Skip to content

Commit 64796bb

Browse files
committed
Fixed error creating a new network. Refs #17321
1 parent 1c31e70 commit 64796bb

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

src/netedit/GNEApplicationWindow.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,15 +1172,6 @@ GNEApplicationWindow::onCmdClose(FXObject*, FXSelector sel, void*) {
11721172
myEditMenuCommands.networkViewOptions.hideNetworkViewOptionsMenuChecks();
11731173
myEditMenuCommands.demandViewOptions.hideDemandViewOptionsMenuChecks();
11741174
myEditMenuCommands.dataViewOptions.hideDataViewOptionsMenuChecks();
1175-
// reset files (except if we're reloading)
1176-
if (!reloading) {
1177-
// specific from SUMO
1178-
auto& neteditOptions = OptionsCont::getOptions();
1179-
neteditOptions.resetWritable();
1180-
neteditOptions.set("-file", "");
1181-
neteditOptions.set("tls-file", "");
1182-
neteditOptions.set("edgetypes-file", "");
1183-
}
11841175
return 1;
11851176
} else {
11861177
return 0;
@@ -1365,6 +1356,9 @@ GNEApplicationWindow::handleEvent_FileLoaded(GUIEvent* e) {
13651356
case GNEEvent_FileLoaded::Type::CONSOLE:
13661357
successMessage = TLF("Network '%' loaded through console", fileLoadedEvent->getFile());
13671358
break;
1359+
case GNEEvent_FileLoaded::Type::NEW:
1360+
successMessage = TL("New network successfully created");
1361+
break;
13681362
default:
13691363
throw ProcessError("Invalid sucess mesage. Check if all cases were covered");
13701364
}

src/netedit/GNEApplicationWindowHelper.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2646,12 +2646,14 @@ GNEApplicationWindowHelper::FileBucketHandler::updateOptions() {
26462646
} else {
26472647
myNeteditOptions.resetDefault("sumocfg-file");
26482648
}
2649-
// netconvert config (only netedit)
2650-
if (netconvertconfig.size() > 0) {
2651-
myNeteditOptions.set("netconvert-file", netconvertconfig);
2652-
} else {
2653-
myNeteditOptions.resetDefault("netconvert-file");
2654-
}
2649+
// netconvert config (only netedit, but currently disabled)
2650+
/*
2651+
if (netconvertconfig.size() > 0) {
2652+
myNeteditOptions.set("netconvert-file", myPlainXMLPrefix + ".netccfg");
2653+
} else {
2654+
myNeteditOptions.resetDefault("netconvert-file");
2655+
}
2656+
*/
26552657
// netedit config (only netedit)
26562658
if (neteditconfig.size() > 0) {
26572659
myNeteditOptions.set("configuration-file", neteditconfig);

0 commit comments

Comments
 (0)