Fixed merge problem

Antti Kauppila · adbridge · commit 44b009160d39 · 2018-10-19T15:10:50.000+01:00
diff --git a/features/cellular/framework/AT/AT_CellularDevice.cpp b/features/cellular/framework/AT/AT_CellularDevice.cpp
@@ -171,13 +171,10 @@ CellularInformation *AT_CellularDevice::open_information(FileHandle *fh)
 void AT_CellularDevice::close_network()
 {
     if (_network) {
-        _network_ref_count--;
-        if (_network_ref_count == 0) {
-            ATHandler *atHandler = &_network->get_at_handler();
-            delete _network;
-            _network = NULL;
-            release_at_handler(atHandler);
-        }
+        ATHandler *atHandler = &_network->get_at_handler();
+        delete _network;
+        _network = NULL;
+        release_at_handler(atHandler);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -171,13 +171,10 @@ CellularInformation AT_CellularDevice::open_information(FileHandle fh)`
`171`	`171`	`void AT_CellularDevice::close_network()`
`172`	`172`	`{`
`173`	`173`	`if (_network) {`
`174`		`- _network_ref_count--;`
`175`		`- if (_network_ref_count == 0) {`
`176`		`- ATHandler *atHandler = &_network->get_at_handler();`
`177`		`- delete _network;`
`178`		`- _network = NULL;`
`179`		`- release_at_handler(atHandler);`
`180`		`- }`
	`174`	`+ ATHandler *atHandler = &_network->get_at_handler();`
	`175`	`+ delete _network;`
	`176`	`+ _network = NULL;`
	`177`	`+ release_at_handler(atHandler);`
`181`	`178`	`}`
`182`	`179`	`}`
`183`	`180`