Made toolbar working in subdirectorys.
Merge pull request #1090 from cmfcmf/#1087

Made toolbar working in subdirectorys.