diff options
| author | sapier <Sapier at GMX dot net> | 2014-02-05 01:35:40 +0100 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-02-04 22:14:13 -0500 |
| commit | 3f376a092e1c16429fb52f24736e9da98aff4cd5 (patch) | |
| tree | 7055808f86884593ef2f63316d61533968112956 /src/main.cpp | |
| parent | 2927a327cabe4feddc0aeea0f4111d888560612f (diff) | |
| download | minetest-3f376a092e1c16429fb52f24736e9da98aff4cd5.tar.gz minetest-3f376a092e1c16429fb52f24736e9da98aff4cd5.tar.bz2 minetest-3f376a092e1c16429fb52f24736e9da98aff4cd5.zip | |
Fix settings to honor numeric conversion errors
Rename try* non exceptioning functions to *NoEx
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8186e26c8..c90e6fde3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1671,9 +1671,10 @@ int main(int argc, char *argv[]) //infostream<<"Main: password hash: '"<<password<<"'"<<std::endl; address = menudata.address; - int newport = stoi(menudata.port); - if(newport != 0) - port = newport; + try { + port = stoi(menudata.port); + } + catch (NumericException&e) {} simple_singleplayer_mode = menudata.simple_singleplayer_mode; |