Merge pull request #7834 from hpvb/x11-return-to-cwd-at-exit
X11 return to cwd at exit
This commit is contained in:
commit
7902444f38
1 changed files with 9 additions and 0 deletions
|
@ -26,6 +26,9 @@
|
|||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "main/main.h"
|
||||
#include "os_x11.h"
|
||||
|
||||
|
@ -33,6 +36,9 @@ int main(int argc, char* argv[]) {
|
|||
|
||||
OS_X11 os;
|
||||
|
||||
char *cwd = (char*)malloc(PATH_MAX);
|
||||
getcwd(cwd, PATH_MAX);
|
||||
|
||||
Error err = Main::setup(argv[0],argc-1,&argv[1]);
|
||||
if (err!=OK)
|
||||
return 255;
|
||||
|
@ -41,5 +47,8 @@ int main(int argc, char* argv[]) {
|
|||
os.run(); // it is actually the OS that decides how to run
|
||||
Main::cleanup();
|
||||
|
||||
chdir(cwd);
|
||||
free(cwd);
|
||||
|
||||
return os.get_exit_code();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue